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

[Dennis Knochenwefel]

fixed memory leak reading data of zstring after destruction. Encoded illegal char in exception to not cause any problems.

fix for bug #1021025

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1021025-2012-07-04T18-07-03.899Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1021025-2012-07-04T18-07-03.899Z 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: 2 Pending.

[Ghislain Fourny (gislenius)]

Nice catch Dennis :-)

review: Approve

[Till Westmann (tillw)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1021025-2012-07-05T16-52-53.307Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1021025-2012-07-05T16-52-53.307Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/runtime/json/json_impl.cpp'
--- src/runtime/json/json_impl.cpp	2012-06-28 04:14:03 +0000
+++ src/runtime/json/json_impl.cpp	2012-07-04 18:06:19 +0000
@@ -25,6 +25,7 @@
 #include "system/globalenv.h"
 
 #include "util/mem_streambuf.h"
+#include "util/string_util.h"
 
 #include "jsonml_array.h"
 #include "snelson.h"
@@ -63,6 +64,7 @@
   options_type options;
   istringstream iss;
   mem_streambuf buf;
+  zstring s;
 
   PlanIteratorState *state;
   DEFAULT_STACK_INIT( PlanIteratorState, state, planState );
@@ -78,7 +80,6 @@
   if ( cur_item->isStreamable() ) {
     is = &cur_item->getStream();
   } else {
-    zstring s;
     cur_item->getStringValue2( s );
     // Doing it this way uses the string data in-place with no copy.
     buf.set( s.data(), s.size() );
@@ -104,7 +105,9 @@
   catch ( json::illegal_character const &e ) {
     throw XQUERY_EXCEPTION(
       zerr::ZJPE0001_ILLEGAL_CHARACTER,
-      ERROR_PARAMS( e.get_char() ),
+      ERROR_PARAMS(zstring("#x") + 
+      BUILD_STRING(std::uppercase << std::hex
+                   << (static_cast<unsigned int>(e.get_char()) & 0xFF)) ),
       ERROR_LOC( e.get_loc() )
     );
   }