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

[Dennis Knochenwefel]

fix for bug #1020953 (access of freed object)

fix for bug #1020953

[Nicolae Brinza (nbrinza)]

review: Approve

[Ghislain Fourny (gislenius)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1020953-2012-07-04T15-27-03.895Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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

All tests succeeded!

=== modified file 'src/store/naive/loader_fast.cpp'
--- src/store/naive/loader_fast.cpp	2012-06-28 04:14:03 +0000
+++ src/store/naive/loader_fast.cpp	2012-07-04 13:37:21 +0000
@@ -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