antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

* Add some sanity checks to improve error messages.

Browse source
This commit is contained in:
hns 2007-03-30 15:28:38 +00:00
parent 4781c7a8ff
commit aa648dd876
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/helma/framework/core/Skin.java
View file

@ -373,7 +373,8 @@ public final class Skin {
case '<':
if (state == PARSE_PARAM && quotechar == '\u0000' && source[i + 1] == '%') {
if (state == PARSE_PARAM && quotechar == '\u0000'
&& b.length() == 0 && source[i + 1] == '%') {
Macro macro = new Macro(i, 2);
hasNestedMacros = true;
addParameter(lastParamName, macro);
@ -605,7 +606,7 @@ public final class Skin {
throws Exception {
// immediately return for comment macros
if (isCommentMacro) {
if (isCommentMacro || name == null) {
return null;
}
@ -665,7 +666,7 @@ public final class Skin {
return filter(reval, value, thisObject, handlerCache);
}
// display error message unless silent failmode is on
if ((handlerObject == null || !engine.hasProperty(handlerObject, propName))
if (!engine.hasProperty(handlerObject, propName)
&& standardParams.verboseFailmode(handlerObject, engine)) {
throw new MacroUnhandledException(name);
}
@ -756,7 +757,9 @@ public final class Skin {
Object thisObject, Map handlerCache)
throws Exception {
if ((sandbox != null) && !sandbox.contains(name)) {
if (name == null) {
throw new RuntimeException("Empty macro filter");
} else if (sandbox != null && !sandbox.contains(name)) {
throw new RuntimeException("Macro " + name + " not allowed in sandbox");
}
Object handlerObject = null;