Merge lp:~zorba-coders/zorba/bug-1070706 into lp:zorba

[Ghislain Fourny]

Fixes a bug that leads to a crash if there are inline, anonymous functions in a stack trace.

Fixes a bug that leads to a crash if there are inline, anonymous functions in a stack trace.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1070706-2012-11-08T14-10-43.793Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1070706-2012-11-08T14-10-43.793Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 3 Pending.

[Sorin Marian Nasoi (sorin.marian.nasoi)]

review: Approve

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1070706-2012-11-08T15-22-50.872Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1070706-2012-11-08T15-22-50.872Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/diagnostics/xquery_stack_trace.cpp'
--- src/diagnostics/xquery_stack_trace.cpp	2012-09-19 21:16:15 +0000
+++ src/diagnostics/xquery_stack_trace.cpp	2012-11-08 14:18:22 +0000
@@ -15,12 +15,16 @@
  */
 #include "stdafx.h"
 
+#include "xquery_stack_trace.h"
+
 #include <typeinfo>
 
+#include <store/api/item_factory.h>
+#include <store/api/store.h>
+#include <system/globalenv.h>
 #include <zorba/xquery_exception.h>
 
 #include "diagnostic.h"
-#include "xquery_stack_trace.h"
 
 namespace zorba {
 
@@ -56,6 +60,17 @@
     XQueryStackTrace::fn_arity_type fn_arity,
     ZorbaException &ze ) 
 {
+  store::Item_t lPrintedFunctionName;
+  if (fn_name == NULL)
+  {
+    GENV_STORE.getItemFactory()->createQName(
+        lPrintedFunctionName,
+        "",
+        "inline",
+        "anonymous");
+  } else {
+    lPrintedFunctionName = fn_name;
+  }
   if ( XQueryException *const xe = dynamic_cast<XQueryException*>( &ze ) )
   {
     XQueryStackTrace &trace = xe->query_trace();
@@ -77,7 +92,7 @@
 
     trace.push(
       XQueryStackTrace::Entry(
-        diagnostic::to_QName<XQueryStackTrace::fn_name_type>( fn_name ),
+        diagnostic::to_QName<XQueryStackTrace::fn_name_type>( lPrintedFunctionName ),
         fn_arity,
         call_loc.getFilename().c_str(),
         call_loc.getLineBegin(),
 
=== added file 'test/rbkt/ExpQueryResults/zorba/HigherOrder/hof-040.xml.res'
--- test/rbkt/ExpQueryResults/zorba/HigherOrder/hof-040.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/HigherOrder/hof-040.xml.res	2012-11-08 14:18:22 +0000
@@ -0,0 +1,1 @@
+0
 
=== added file 'test/rbkt/ExpQueryResults/zorba/HigherOrder/hof-041.xml.res'
--- test/rbkt/ExpQueryResults/zorba/HigherOrder/hof-041.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/HigherOrder/hof-041.xml.res	2012-11-08 14:18:22 +0000
@@ -0,0 +1,1 @@
+0
 
=== added file 'test/rbkt/Queries/zorba/HigherOrder/hof-040.xq'
--- test/rbkt/Queries/zorba/HigherOrder/hof-040.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/HigherOrder/hof-040.xq	2012-11-08 14:18:22 +0000
@@ -0,0 +1,5 @@
+declare namespace o = "http://www.zorba-xquery.com/options/features";
+declare namespace err = "http://www.w3.org/2005/xqt-errors";
+declare option o:enable "hof";
+
+try { function () { fn:error() } () } catch err:FOER0000 { 0 }
 
=== added file 'test/rbkt/Queries/zorba/HigherOrder/hof-041.xq'
--- test/rbkt/Queries/zorba/HigherOrder/hof-041.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/HigherOrder/hof-041.xq	2012-11-08 14:18:22 +0000
@@ -0,0 +1,5 @@
+declare namespace o = "http://www.zorba-xquery.com/options/features";
+declare namespace err = "http://www.w3.org/2005/xqt-errors";
+declare option o:enable "hof";
+
+try { function() { 1 div 0 } () } catch err:FOAR0001 { 0 }