Skip to content
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

chore(iast): memory leak in aspect modulo #11787

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

chore(iast): memory leak in aspect modulo #11787

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
980de6a
Revert "refactor(iast): simplify ``__mod__`` aspect (#11601)"
avara1986 Dec 19, 2024
3f9529f
release note
avara1986 Dec 19, 2024
5150ff9
remove release note
avara1986 Dec 19, 2024
bff2c0b
Merge branch 'main' into avara1986/revert_modulo
avara1986 Dec 19, 2024
963efe9
Merge branch 'main' into avara1986/revert_modulo
avara1986 Dec 19, 2024
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
43 changes: 25 additions & 18 deletions ddtrace/appsec/_iast/_taint_tracking/Aspects/AspectModulo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "Helpers.h"

static PyObject*
do_modulo(PyObject* text, PyObject* insert_tuple_or_obj, py::object py_candidate_text, py::object py_candidate_tuple)
do_modulo(PyObject* text, PyObject* insert_tuple_or_obj)
{
PyObject* result = nullptr;

Expand All @@ -13,22 +13,18 @@ do_modulo(PyObject* text, PyObject* insert_tuple_or_obj, py::object py_candidate
Py_INCREF(insert_tuple);
} else {
insert_tuple = PyTuple_Pack(1, insert_tuple_or_obj);
if (insert_tuple == nullptr) {
return nullptr;
}
}

if (PyUnicode_Check(text) && insert_tuple != nullptr) {
if (PyUnicode_Check(text)) {
result = PyUnicode_Format(text, insert_tuple);
} else if (PyBytes_Check(text) or PyByteArray_Check(text)) {
auto method_name = PyUnicode_FromString("__mod__");
result = PyObject_CallMethodObjArgs(text, method_name, insert_tuple, nullptr);
Py_DECREF(method_name);
} else {
try {
py::object res_py = py_candidate_text.attr("__mod__")(py_candidate_tuple);
PyObject* res_pyo = res_py.ptr();
if (res_pyo != nullptr) {
Py_INCREF(res_pyo);
}
return res_pyo;
} catch (py::error_already_set& e) {
e.restore();
return nullptr;
}
}
Py_DECREF(insert_tuple);
if (has_pyerr()) {
Expand All @@ -53,7 +49,21 @@ api_modulo_aspect(PyObject* self, PyObject* const* args, const Py_ssize_t nargs)

// Lambda to get the result of the modulo operation
auto get_result = [&]() -> PyObject* {
return do_modulo(candidate_text, candidate_tuple, py_candidate_text, py_candidate_tuple);
PyObject* res = do_modulo(candidate_text, candidate_tuple);
if (res == nullptr) {
try {
py::object res_py = py_candidate_text.attr("__mod__")(py_candidate_tuple);
PyObject* res_pyo = res_py.ptr();
if (res_pyo != nullptr) {
Py_INCREF(res_pyo);
}
return res_pyo;
} catch (py::error_already_set& e) {
e.restore();
return nullptr;
}
}
return res;
};

TRY_CATCH_ASPECT("modulo_aspect", return get_result(), , {
Expand Down Expand Up @@ -97,10 +107,7 @@ api_modulo_aspect(PyObject* self, PyObject* const* args, const Py_ssize_t nargs)
}
py::tuple formatted_parameters(list_formatted_parameters);

PyObject* applied_params = do_modulo(StringToPyObject(fmttext, py_str_type).ptr(),
formatted_parameters.ptr(),
StringToPyObject(fmttext, py_str_type),
formatted_parameters);
PyObject* applied_params = do_modulo(StringToPyObject(fmttext, py_str_type).ptr(), formatted_parameters.ptr());
if (applied_params == nullptr) {
return get_result();
}
Expand Down
Loading