zorba-coders team mailing list archive

[Markos Zaharioudakis <markos_za@xxxxxxxxx>]

Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba.

Commit message:
Fixed memory leak in temp sequence

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/158282

Fixed memory leak in temp sequence
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/158282
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'ChangeLog'
--- ChangeLog	2013-04-10 14:18:16 +0000
+++ ChangeLog	2013-04-11 06:55:27 +0000
@@ -71,6 +71,7 @@
   * Fixed bug #1099535  (xml:parse endless loop)
   * Fixed bug in optimizing fn:count over general-index probes
   * Fixed bug #866958  (Parsing error not explicit enough)
+  * Fixed memory leak in temp sequence
   * Fixed bug in computing the static type of a self-axis path step.
   * Fixed bug #867068: (Incorrect usage of XQDY0027)
   * Fixed bug: jsoniq constructor should not be const-folded

=== modified file 'src/store/naive/simple_temp_seq.cpp'
--- src/store/naive/simple_temp_seq.cpp	2013-03-04 21:00:58 +0000
+++ src/store/naive/simple_temp_seq.cpp	2013-04-11 06:55:27 +0000
@@ -60,7 +60,15 @@
 ********************************************************************************/
 SimpleTempSeq::SimpleTempSeq(const store::Iterator_t& iter)
 {
-  init(iter);
+  try
+  {
+    init(iter);
+  }
+  catch (...)
+  {
+    clear();
+    throw;
+  }
 }