HackBase/python-cx_Oracle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Older versions of Python 2.7 don't have PyMem_Calloc() so use PyMem_Malloc()

Browse Source 
and memset() instead for Python 2.7.
This commit is contained in:
Anthony Tuininga 2019-11-29 15:20:42 -07:00
parent 02d336c5e9
commit 22642e2826
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/cxoConnection.c
View File

@ -415,8 +415,21 @@ static int cxoConnectionParams_processShardingKey(cxoConnectionParams *params,
return 0; return 0;
// allocate memory for the sharding key values // allocate memory for the sharding key values
#if PY_MAJOR_VERSION >= 3
columns = PyMem_Calloc(numColumns, sizeof(dpiShardingKeyColumn)); columns = PyMem_Calloc(numColumns, sizeof(dpiShardingKeyColumn));
buffers = PyMem_Calloc(numColumns, sizeof(cxoBuffer)); buffers = PyMem_Calloc(numColumns, sizeof(cxoBuffer));
#else
columns = PyMem_Malloc(numColumns * sizeof(dpiShardingKeyColumn));
buffers = PyMem_Malloc(numColumns * sizeof(cxoBuffer));
#endif
if (!columns || !buffers) {
PyErr_NoMemory();
return -1;
}
#if PY_MAJOR_VERSION < 3
memset(columns, 0, numColumns * sizeof(dpiShardingKeyColumn));
memset(buffers, 0, numColumns * sizeof(cxoBuffer));
#endif
if (isSuperShardingKey) { if (isSuperShardingKey) {
params->superShardingKeyColumns = columns; params->superShardingKeyColumns = columns;
params->superShardingKeyBuffers = buffers; params->superShardingKeyBuffers = buffers;
@ -426,10 +439,6 @@ static int cxoConnectionParams_processShardingKey(cxoConnectionParams *params,
params->shardingKeyBuffers = buffers; params->shardingKeyBuffers = buffers;
params->numShardingKeyColumns = numColumns; params->numShardingKeyColumns = numColumns;
} }
if (!columns || !buffers) {
PyErr_NoMemory();
return -1;
}
// process each value // process each value
for (i = 0; i < numColumns; i++) { for (i = 0; i < numColumns; i++) {