[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1020953 into lp:zorba

2012-07-04 Thread Dennis Knochenwefel 
Dennis Knochenwefel has proposed merging lp:~zorba-coders/zorba/bug-1020953 
into lp:zorba.

Requested reviews:
  Nicolae Brinza (nbrinza)
Related bugs:
  Bug #1020953 in Zorba: "segfault in modules/xml:parse()"
  https://bugs.launchpad.net/zorba/+bug/1020953

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1020953/+merge/113400

fix for bug #1020953
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1020953/+merge/113400
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/store/naive/loader_fast.cpp'
--- src/store/naive/loader_fast.cpp	2012-06-28 04:14:03 +
+++ src/store/naive/loader_fast.cpp	2012-07-04 13:37:21 +
@@ -160,23 +160,23 @@
   theBaseUri.~zstring();
   theDocUri.~zstring();
 
+  theOrdPath.init();
+  theRootNode = NULL;
+
+  while(!theNodeStack.empty())
+  {
+XmlNode* node = theNodeStack.top();
+theNodeStack.pop();
+if (node != NULL)
+  node->destroy(true);
+  }
+
   if (theTree != NULL)
   {
 delete theTree;
 theTree = NULL;
   }
 
-  theOrdPath.init();
-  theRootNode = NULL;
-
-  while(!theNodeStack.empty())
-  {
-XmlNode* node = theNodeStack.top();
-theNodeStack.pop();
-if (node != NULL)
-  node->destroy(true);
-  }
-
   thePathStack.clear();
 
 #ifdef DATAGUIDE

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1020953 into lp:zorba

2012-07-04 Thread Dennis Knochenwefel 
The proposal to merge lp:~zorba-coders/zorba/bug-1020953 into lp:zorba has been 
updated.

Status: Needs review => Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1020953/+merge/113400
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1020953/+merge/113400
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1020953 into lp:zorba

2012-07-04 Thread Zorba Build Bot 
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bug-1020953-2012-07-04T15-27-03.895Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1020953/+merge/113400
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1020953 into lp:zorba

2012-07-04 Thread Zorba Build Bot 
Validation queue job bug-1020953-2012-07-04T15-27-03.895Z is finished. The 
final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1020953/+merge/113400
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1020953 into lp:zorba

2012-07-04 Thread noreply 
The proposal to merge lp:~zorba-coders/zorba/bug-1020953 into lp:zorba has been 
updated.

Status: Approved => Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1020953/+merge/113400
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1020953/+merge/113400
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1020953 into lp:zorba

2012-07-04 Thread Nicolae Brinza 
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1020953/+merge/113400
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1020953 into lp:zorba

2012-07-04 Thread Ghislain Fourny 
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1020953/+merge/113400
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp