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

convert arg to bytes object before passing to PyBytes_AsStringAndSize #15

Merged
merged 1 commit into from
Dec 6, 2015
Merged

convert arg to bytes object before passing to PyBytes_AsStringAndSize #15

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
12 changes: 12 additions & 0 deletions py_ext/tlshmodule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,18 @@ Tlsh_fromTlshStr(tlsh_TlshObject *self, PyObject *args)
return PyErr_Format(PyExc_TypeError, "function takes exactly 1 argument (%lu given)", PyTuple_Size(args));

arg = PyTuple_GetItem(args, 0);
#if PY_MAJOR_VERSION >= 3
if (!PyUnicode_Check(arg) || (arg = PyUnicode_AsASCIIString(arg)) == NULL) {
PyErr_SetString(PyExc_ValueError, "argument is not a TLSH hex string");
return NULL;
}
#else
if (!PyString_Check(arg)) {
PyErr_SetString(PyExc_ValueError, "argument is not a TLSH hex string");
return NULL;
}
#endif

if (PyBytes_AsStringAndSize(arg, &str, &len) == -1) {
PyErr_SetString(PyExc_ValueError, "argument is not a TLSH hex string");
return NULL;
Expand Down