From 5d45e44593c6de9e9343412a60cc056b5aacaf29 Mon Sep 17 00:00:00 2001 From: adustman Date: Mon, 2 Aug 1999 04:24:36 +0000 Subject: [PATCH] Avoid core dump if exception occurs during connect. --- mysql/_mysqlmodule.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mysql/_mysqlmodule.c b/mysql/_mysqlmodule.c index 13ba4a7..5d6698b 100644 --- a/mysql/_mysqlmodule.c +++ b/mysql/_mysqlmodule.c @@ -399,6 +399,15 @@ _mysql_connect(self, args, kwargs) &port, &unix_socket, &client_flag, &conv)) return NULL; + if (conv) { + c->converter = conv; + Py_INCREF(conv); + } else { + if (!(c->converter = PyDict_New())) { + Py_DECREF(c); + return NULL; + } + } Py_BEGIN_ALLOW_THREADS ; conn = mysql_init(&(c->connection)); conn = mysql_real_connect(&(c->connection), host, user, passwd, db, @@ -410,15 +419,6 @@ _mysql_connect(self, args, kwargs) return NULL; } c->open = 1; - if (conv) { - c->converter = conv; - Py_INCREF(conv); - } else { - if (!(c->converter = PyDict_New())) { - Py_DECREF(c); - return NULL; - } - } return (PyObject *) c; }