python/mysqlclient
1
0
Fork 0
mirror of https://github.com/PyMySQL/mysqlclient.git synced 2025-08-26 11:22:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't use strncpy and strncat (#456)

Browse Source
This commit is contained in:
Inada Naoki
2020-12-07 15:57:53 +09:00
committed by GitHub
parent 45ca1a2266
commit 3c4a83bc52
2 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
MySQLdb/_mysql.c
View File

@ -1237,19 +1237,35 @@ _mysql_row_to_dict(
c = PyTuple_GET_ITEM(self->converter, i);
v = _mysql_field_to_python(c, row[i], length[i], &fields[i], self->encoding);
if (!v) goto error;
if (!PyMapping_HasKeyString(r, fields[i].name)) {
PyMapping_SetItemString(r, fields[i].name, v);
} else {
int len;
char buf[256];
strncpy(buf, fields[i].table, 256);
len = strlen(buf);
strncat(buf, ".", 256-len);
len = strlen(buf);
strncat(buf, fields[i].name, 256-len);
PyMapping_SetItemString(r, buf, v);
}
PyObject *pyname = PyUnicode_FromString(fields[i].name);
if (pyname == NULL) {
Py_DECREF(v);
goto error;
}
PyObject *tmp = PyDict_SetDefault(r, pyname, v);
Py_DECREF(pyname);
if (!tmp) {
Py_DECREF(v);
goto error;
}
if (tmp == v) {
Py_DECREF(v);
continue;
}
pyname = PyUnicode_FromFormat("%s.%s", fields[i].table, fields[i].name);
if (!pyname) {
Py_DECREF(v);
goto error;
}
int err = PyDict_SetItem(r, pyname, v);
Py_DECREF(pyname);
Py_DECREF(v);
if (err) {
goto error;
}
}
return r;
error:
@ -1275,20 +1291,22 @@ _mysql_row_to_dict_old(
PyObject *v;
c = PyTuple_GET_ITEM(self->converter, i);
v = _mysql_field_to_python(c, row[i], length[i], &fields[i], self->encoding);
if (!v) goto error;
{
int len=0;
char buf[256]="";
if (!v) {
goto error;
}
PyObject *pyname;
if (strlen(fields[i].table)) {
strncpy(buf, fields[i].table, 256);
len = strlen(buf);
strncat(buf, ".", 256-len);
len = strlen(buf);
}
strncat(buf, fields[i].name, 256-len);
PyMapping_SetItemString(r, buf, v);
pyname = PyUnicode_FromFormat("%s.%s", fields[i].table, fields[i].name);
} else {
pyname = PyUnicode_FromString(fields[i].name);
}
int err = PyDict_SetItem(r, pyname, v);
Py_DECREF(pyname);
Py_DECREF(v);
if (err) {
goto error;
}
}
return r;
error:

2
setup_windows.py
View File

@ -38,7 +38,6 @@ def get_config():
libraries = ["kernel32", "advapi32", "wsock32", client]
include_dirs = [os.path.join(connector, r"include")]
extra_compile_args = ["/Zl", "/D_CRT_SECURE_NO_WARNINGS"]
extra_link_args = ["/MANIFEST"]
name = "mysqlclient"
@ -53,7 +52,6 @@ def get_config():
ext_options = dict(
library_dirs=library_dirs,
libraries=libraries,
extra_compile_args=extra_compile_args,
extra_link_args=extra_link_args,
include_dirs=include_dirs,
extra_objects=extra_objects,