Merge lp:~vkolesnikov/pbxt/pbxt-07-double-free into lp:pbxt/1.0.07-rc

[Vladimir Kolesnikov]

=== modified file 'ChangeLog'
--- ChangeLog	2009-08-09 15:54:22 +0000
+++ ChangeLog	2009-08-11 09:17:53 +0000
@@ -1,6 +1,8 @@
 PBXT Release Notes
 ==================
 
+RN266: Fixed a crash: when initialization failed with an exception THD structure was released twice
+
 ------- 1.0.07q RC - 2009-08-09
 
 RN265: Changes the sequential reading of data log files to skip gaps, instead of returning EOF. This ensures that extended data records are preserved even when something goes wrong with the way the file is written.

=== modified file 'src/ha_pbxt.cc'
--- src/ha_pbxt.cc	2009-07-10 14:52:26 +0000
+++ src/ha_pbxt.cc	2009-08-11 09:17:53 +0000
@@ -1139,16 +1139,17 @@
 					xt_heap_reference(self, pbxt_database);
 				}
 				catch_(b) {
-					if (!curr_thd)
-						myxt_destroy_thread(thd, FALSE);
-#ifndef DRIZZLED
-					myxt_mutex_lock(&LOCK_plugin);
-#endif
 					/* It is possible that the error was reset by cleanup code.
 					 * Set a generic error code in that case.
 					 */
-					if (!self->t_exception.e_xt_err)
-						xt_throw_error(self, XT_REG_CONTEXT, XT_SYSTEM_ERROR, 0, "Initialization failed"); 
+					if (!self->t_exception.e_xt_err) {
+						if (!curr_thd)
+							myxt_destroy_thread(thd, FALSE);
+#ifndef DRIZZLED
+						myxt_mutex_lock(&LOCK_plugin);
+#endif
+						xt_throw_error(self, XT_REG_CONTEXT, XT_SYSTEM_ERROR, 0, "Initialization failed");
+					}
 				}
 				cont_(b);