Merge pull request #1116 from LeoWoerteler/gh-1115

GH-1115: NPE in `prof:variables()` when variable is not yet bound.
BaseXdb · Mar 26, 2015 · 92e3acc · 92e3acc
2 parents a961894 + 560e113
commit 92e3acc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/basex-core/src/main/java/org/basex/query/var/QueryStack.java b/basex-core/src/main/java/org/basex/query/var/QueryStack.java
@@ -131,9 +131,11 @@ public void set(final Var var, final Value val, final QueryContext qc, final Inp
    */
   public String dump() {
     final StringBuilder sb = new StringBuilder(QueryText.DEBUGLOCAL + ':');
-    for(int i = end - 1; i >= 0; i--) {
-      sb.append(Prop.NL).append("  $").append(vars[i].name).append(" := ").append(stack[i]);
-      if(i == start && i > 0) sb.append(Prop.NL).append(QueryText.DEBUGGLOBAL + ':');
+    for(int i = end; --i >= 0;) {
+      if(vars[i] != null) {
+        sb.append(Prop.NL).append("  $").append(vars[i].name).append(" := ").append(stack[i]);
+        if(i == start && i > 0) sb.append(Prop.NL).append(QueryText.DEBUGGLOBAL + ':');
+      }
     }
     return sb.toString();
   }

diff --git a/basex-core/src/test/java/org/basex/query/func/ProfModuleTest.java b/basex-core/src/test/java/org/basex/query/func/ProfModuleTest.java
@@ -76,6 +76,7 @@ public void variables() {
     try {
       System.setErr(NULL);
       query("for $x in 1 to 2 return " + _PROF_VARIABLES.args(), "");
+      query(_PROF_VARIABLES.args() + ", let $x := random:double() return floor($x * $x)", "0");
     } finally {
       System.setErr(ERR);
     }