Skip to content

Fixed danglings refs related to PyObject_GetAttrString #819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Parent: FF to Dev
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fixed danglings refs related to PyObject_GetAttrString #819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/include/pythoncapi_compat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1134,6 +1134,7 @@ static inline int PyTime_PerfCounter(PyTime_t *result)
}

PyObject *res = PyObject_CallNoArgs(func);
Py_XDECREF(func);
if (res == NULL) {
return -1;
}
Expand Down Expand Up @@ -1165,6 +1166,7 @@ static inline int PyTime_PerfCounter(PyTime_t *result)
}

PyObject *res = PyObject_CallNoArgs(func);
Py_XDECREF(func);
if (res == NULL) {
return -1;
}
Expand Down
15 changes: 7 additions & 8 deletions src/main/client/batch_write.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,10 @@
as_error_update(err, AEROSPIKE_ERR_PARAM, \
"batch_type: %s, policy must be a dict", \
__batch_type); \
Py_DECREF(py___policy); \
goto CLEANUP_ON_ERROR; \
} \
} \
Py_DECREF(py___policy); \
Py_XDECREF(py___policy); \
}

// TODO replace this with type checking the batch_records
Expand Down Expand Up @@ -247,7 +246,7 @@ static PyObject *AerospikeClient_BatchWriteInvoke(AerospikeClient *self,
FIELD_NAME_BATCH_TYPE);
goto CLEANUP1;
}

py_ops_list =
PyObject_GetAttrString(py_batch_record, FIELD_NAME_BATCH_OPS);
if (py_ops_list == NULL || !PyList_Check(py_ops_list) ||
Expand All @@ -262,7 +261,7 @@ static PyObject *AerospikeClient_BatchWriteInvoke(AerospikeClient *self,
FIELD_NAME_BATCH_OPS);
// TODO: mem leak if ops is not a list?
// Fix later
goto CLEANUP1;
goto CLEANUP0;
}

// the batch record object had no ops attribute but some don't, so this is ok.
Expand Down Expand Up @@ -376,8 +375,8 @@ static PyObject *AerospikeClient_BatchWriteInvoke(AerospikeClient *self,
Py_XDECREF(py_mod);
goto CLEANUP_ON_ERROR;
}
Py_DECREF(py_mod);
const char *mod = PyUnicode_AsUTF8(py_mod);
Py_DECREF(py_mod);

PyObject *py_func = PyObject_GetAttrString(
py_batch_record, FIELD_NAME_BATCH_FUNCTION);
Expand All @@ -387,8 +386,8 @@ static PyObject *AerospikeClient_BatchWriteInvoke(AerospikeClient *self,
Py_XDECREF(py_func);
goto CLEANUP_ON_ERROR;
}
Py_DECREF(py_func);
const char *func = PyUnicode_AsUTF8(py_func);
Py_DECREF(py_func);

PyObject *py_args =
PyObject_GetAttrString(py_batch_record, FIELD_NAME_BATCH_ARGS);
Expand All @@ -403,11 +402,10 @@ static PyObject *AerospikeClient_BatchWriteInvoke(AerospikeClient *self,
as_list *arglist = NULL;
pyobject_to_list(self, err, py_args, &arglist, &static_pool,
SERIALIZER_PYTHON);
Py_DECREF(py_args);
if (err->code != AEROSPIKE_OK) {
Py_DECREF(py_args);
goto CLEANUP_ON_ERROR;
}
Py_DECREF(py_args);
garb->udf_args_to_free = arglist;

as_batch_apply_record *ar;
Expand Down Expand Up @@ -522,6 +520,7 @@ static PyObject *AerospikeClient_BatchWriteInvoke(AerospikeClient *self,

CLEANUP_ON_ERROR:
Py_XDECREF(py_meta);
CLEANUP0:
Py_XDECREF(py_ops_list);
CLEANUP1:
Py_XDECREF(py_batch_type);
Expand Down
55 changes: 39 additions & 16 deletions src/main/conversions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2705,58 +2705,68 @@ as_status get_cdt_ctx(AerospikeClient *self, as_error *err, as_cdt_ctx *cdt_ctx,
as_static_pool *static_pool, int serializer_type)
{
PyObject *py_ctx = PyDict_GetItemString(op_dict, CTX_KEY);
long int_val = 0;
as_val *val = NULL;

if (!py_ctx) {
return AEROSPIKE_OK;
}

long int_val = 0;
as_val *val = NULL;

as_status status = 0;
PyObject *id_temp = NULL;
PyObject *value_temp = NULL;
PyObject *extra_args_temp = NULL;

if (PyList_Check(py_ctx)) {
Py_ssize_t py_list_size = PyList_Size(py_ctx);
as_cdt_ctx_init(cdt_ctx, (int)py_list_size);

for (int i = 0; i < py_list_size; i++) {
PyObject *py_val = PyList_GetItem(py_ctx, (Py_ssize_t)i);

PyObject *id_temp = PyObject_GetAttrString(py_val, "id");
id_temp = PyObject_GetAttrString(py_val, "id");
if (PyErr_Occurred()) {
as_cdt_ctx_destroy(cdt_ctx);
return as_error_update(err, AEROSPIKE_ERR_PARAM,
status = as_error_update(err, AEROSPIKE_ERR_PARAM,
"Failed to convert %s, id", CTX_KEY);
goto CLEANUP4;
}

PyObject *value_temp = PyObject_GetAttrString(py_val, "value");
value_temp = PyObject_GetAttrString(py_val, "value");
if (PyErr_Occurred()) {
as_cdt_ctx_destroy(cdt_ctx);
return as_error_update(err, AEROSPIKE_ERR_PARAM,
status = as_error_update(err, AEROSPIKE_ERR_PARAM,
"Failed to convert %s, value", CTX_KEY);
goto CLEANUP3;
}

PyObject *extra_args_temp =
PyObject_GetAttrString(py_val, "extra_args");
extra_args_temp = PyObject_GetAttrString(py_val, "extra_args");
if (PyErr_Occurred()) {
as_cdt_ctx_destroy(cdt_ctx);
return as_error_update(err, AEROSPIKE_ERR_PARAM,
status = as_error_update(err, AEROSPIKE_ERR_PARAM,
"Failed to convert %s", CTX_KEY);
goto CLEANUP2;
}

uint64_t item_type = PyLong_AsUnsignedLongLong(id_temp);
if (PyErr_Occurred()) {
as_cdt_ctx_destroy(cdt_ctx);
return as_error_update(err, AEROSPIKE_ERR_PARAM,
status = as_error_update(err, AEROSPIKE_ERR_PARAM,
"Failed to convert %s, id to uint64_t",
CTX_KEY);
goto CLEANUP1;
}

// add an as_cdt_ctx with value to cdt_ctx
if (requires_int(item_type)) {
int_val = PyLong_AsLong(value_temp);
if (PyErr_Occurred()) {
as_cdt_ctx_destroy(cdt_ctx);
return as_error_update(
status = as_error_update(
err, AEROSPIKE_ERR_PARAM,
"Failed to convert %s, value to long", CTX_KEY);
goto CLEANUP1;
}
switch (item_type) {
case AS_CDT_CTX_LIST_INDEX:
Expand All @@ -2783,19 +2793,21 @@ as_status get_cdt_ctx(AerospikeClient *self, as_error *err, as_cdt_ctx *cdt_ctx,
break;
default:
as_cdt_ctx_destroy(cdt_ctx);
return as_error_update(
status = as_error_update(
err, AEROSPIKE_ERR_PARAM,
"Failed to convert, unknown ctx operation %s", CTX_KEY);
goto CLEANUP1;
}
}
else {
if (as_val_new_from_pyobject(self, err, value_temp, &val,
static_pool,
serializer_type) != AEROSPIKE_OK) {
as_cdt_ctx_destroy(cdt_ctx);
return as_error_update(
status = as_error_update(
err, AEROSPIKE_ERR_PARAM,
"Failed to convert %s, value to as_val", CTX_KEY);
goto CLEANUP1;
}
switch (item_type) {
case AS_CDT_CTX_LIST_VALUE:
Expand All @@ -2815,24 +2827,35 @@ as_status get_cdt_ctx(AerospikeClient *self, as_error *err, as_cdt_ctx *cdt_ctx,
break;
default:
as_cdt_ctx_destroy(cdt_ctx);
return as_error_update(
status = as_error_update(
err, AEROSPIKE_ERR_PARAM,
"Failed to convert, unknown ctx operation %s", CTX_KEY);
goto CLEANUP1;
}
}

Py_DECREF(id_temp);
Py_DECREF(value_temp);
Py_XDECREF(extra_args_temp);
Py_DECREF(extra_args_temp);
}
}
else {
return as_error_update(err, AEROSPIKE_ERR_PARAM, "Failed to convert %s",
status = as_error_update(err, AEROSPIKE_ERR_PARAM, "Failed to convert %s",
CTX_KEY);
goto CLEANUP4;
}

*ctx_in_use = true;
return AEROSPIKE_OK;

CLEANUP1:
Py_DECREF(extra_args_temp);
CLEANUP2:
Py_DECREF(value_temp);
CLEANUP3:
Py_DECREF(id_temp);
CLEANUP4:
return status;
}

static bool requires_int(uint64_t op)
Expand Down
Loading