Merge pull request #816 from kpumuk/segfault-fix

Segfault on SIGINT (race condition)
brianmario · Jan 2, 2017 · 458834a · 458834a
2 parents 301b14b + 9c14d32
commit 458834a
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/ext/mysql2/client.c b/ext/mysql2/client.c
@@ -596,9 +596,11 @@ static VALUE disconnect_and_raise(VALUE self, VALUE error) {
   /* Invalidate the MySQL socket to prevent further communication.
    * The GC will come along later and call mysql_close to free it.
    */
-  if (invalidate_fd(wrapper->client->net.fd) == Qfalse) {
-    fprintf(stderr, "[WARN] mysql2 failed to invalidate FD safely, closing unsafely\n");
-    close(wrapper->client->net.fd);
+  if (wrapper->client) {
+    if (invalidate_fd(wrapper->client->net.fd) == Qfalse) {
+      fprintf(stderr, "[WARN] mysql2 failed to invalidate FD safely, closing unsafely\n");
+      close(wrapper->client->net.fd);
+    }
   }
 
   rb_exc_raise(error);