hcq/openGauss-connector-python-psycopg2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!20 修复若干malloc与free的空间问题

Browse Source 
Merge pull request !20 from Luan-233/master
This commit is contained in:
opengauss_bot
2023-09-22 07:01:14 +00:00
committed by Gitee
parent d91399d1ae 19d1f3a5ed
commit a818ac9ae9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
psycopg/bytes_format.c
View File

@ -227,7 +227,7 @@ PyObject *Bytes_Format(PyObject *format, PyObject *args, char place_holder) {
} /* '%' */ } /* '%' */
} /* until end */ } /* until end */
if (dict) { // if args' type is dict, the func ends if (dict || (arglen < 0) || (argidx < 0)) { // args' type is dict, the func ends
if (args_owned) Py_DECREF(args); if (args_owned) Py_DECREF(args);
if (!(result = resize_bytes(result, reslen - rescnt))) return NULL; // resize and return if (!(result = resize_bytes(result, reslen - rescnt))) return NULL; // resize and return
if (place_holder != '%') { if (place_holder != '%') {
@ -238,8 +238,8 @@ PyObject *Bytes_Format(PyObject *format, PyObject *args, char place_holder) {
} }
args_list = (char **)malloc(sizeof(char *) * arglen); // buffer args_list = (char **)malloc(sizeof(char *) * arglen); // buffer
memset(args_list, NULL, sizeof(char *) * arglen); memset(args_list, 0, sizeof(char *) * arglen);
args_len = (Py_ssize_t *)malloc(sizeof(Py_ssize_t *) * arglen); // length of every argument args_len = (Py_ssize_t *)malloc(sizeof(Py_ssize_t) * arglen); // length of every argument
while ((args_value = getnextarg(args, arglen, &argidx)) != NULL) { // stop when receive NULL while ((args_value = getnextarg(args, arglen, &argidx)) != NULL) { // stop when receive NULL
Py_ssize_t length = 0; Py_ssize_t length = 0;
if (!Bytes_CheckExact(args_value)) { if (!Bytes_CheckExact(args_value)) {
@ -251,14 +251,14 @@ PyObject *Bytes_Format(PyObject *format, PyObject *args, char place_holder) {
length = Bytes_GET_SIZE(args_value); length = Bytes_GET_SIZE(args_value);
// printf("type: %s, len: %d, value: %s\n", Py_TYPE(args_value)->tp_name, length, args_buffer); // printf("type: %s, len: %d, value: %s\n", Py_TYPE(args_value)->tp_name, length, args_buffer);
args_len[argidx - 1] = length; args_len[argidx - 1] = length;
args_list[argidx - 1] = (char *)malloc(sizeof(char *) * (length + 1)); args_list[argidx - 1] = (char *)malloc(sizeof(char) * (length + 1));
Py_MEMCPY(args_list[argidx - 1], args_buffer, length); Py_MEMCPY(args_list[argidx - 1], args_buffer, length);
args_list[argidx - 1][length] = '\0'; args_list[argidx - 1][length] = '\0';
Py_XDECREF(args_value); Py_XDECREF(args_value);
} }
arg_usecnt = (int *)malloc(sizeof(int) * arglen); arg_usecnt = (int *)malloc(sizeof(int) * arglen);
memset(arg_usecnt, 0, sizeof(char *) * arglen); memset(arg_usecnt, 0, sizeof(int) * arglen);
fmt = Bytes_AS_STRING(format); // get pointer of format fmt = Bytes_AS_STRING(format); // get pointer of format
fmtcnt = Bytes_GET_SIZE(format); // get length of format fmtcnt = Bytes_GET_SIZE(format); // get length of format