wait to free mysql* handle until we're freed

brianmario · brianmario · commit 14c6bed2d8ed · 2013-02-19T21:26:08.000-08:00
diff --git a/ext/mysql2/client.c b/ext/mysql2/client.c
@@ -177,7 +177,6 @@ static VALUE nogvl_close(void *ptr) {
 #endif
 
     mysql_close(wrapper->client);
-    xfree(wrapper->client);
   }
 
   return Qnil;
@@ -188,6 +187,7 @@ static void rb_mysql_client_free(void * ptr) {
 
   nogvl_close(wrapper);
 
+  xfree(wrapper->client);
   xfree(ptr);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,6 @@ static VALUE nogvl_close(void *ptr) {`
`177`	`177`	`#endif`
`178`	`178`
`179`	`179`	`mysql_close(wrapper->client);`
`180`		`- xfree(wrapper->client);`
`181`	`180`	`}`
`182`	`181`
`183`	`182`	`return Qnil;`
`@@ -188,6 +187,7 @@ static void rb_mysql_client_free(void * ptr) {`
`188`	`187`
`189`	`188`	`nogvl_close(wrapper);`
`190`	`189`
	`190`	`+ xfree(wrapper->client);`
`191`	`191`	`xfree(ptr);`
`192`	`192`	`}`
`193`	`193`