python/mysqlclient
1
0
Fork 0
mirror of https://github.com/PyMySQL/mysqlclient.git synced 2025-08-16 12:27:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid core dump if exception occurs during connect.

Browse Source
This commit is contained in:
adustman
1999-08-02 04:24:36 +00:00
parent 14aec8c4d4
commit 5d45e44593
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mysql/_mysqlmodule.c
View File

@ -399,6 +399,15 @@ _mysql_connect(self, args, kwargs)
&port, &unix_socket, &client_flag, &port, &unix_socket, &client_flag,
&conv)) &conv))
return NULL; 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 ; Py_BEGIN_ALLOW_THREADS ;
conn = mysql_init(&(c->connection)); conn = mysql_init(&(c->connection));
conn = mysql_real_connect(&(c->connection), host, user, passwd, db, conn = mysql_real_connect(&(c->connection), host, user, passwd, db,
@ -410,15 +419,6 @@ _mysql_connect(self, args, kwargs)
return NULL; return NULL;
} }
c->open = 1; 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; return (PyObject *) c;
} }