Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
39 changes: 32 additions & 7 deletions P4API.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,14 @@ P4Adapter_init(P4Adapter *self, PyObject *args, PyObject *kwds)
if (PyInt_Check(value)) {
PythonClientAPI::intsetter isetter = self->clientAPI->GetIntSetter(name);
if (isetter) {
int result = (self->clientAPI->*isetter)(PyInt_AS_LONG(value));
if (result)
return result;
long lval = PyInt_AsLong(value);
if (lval == -1 && PyErr_Occurred())
return -1;
if (lval < INT_MIN || lval > INT_MAX)
return PyErr_SetString(PyExc_OverflowError, "integer out of range"), -1;
int result = (self->clientAPI->*isetter)((int)lval);
if (result)
return result;
}
else {
ostringstream os;
Expand Down Expand Up @@ -712,6 +717,12 @@ static PyObject * P4Adapter_getattro(P4Adapter *self, PyObject * nameObject)
static int P4Adapter_setattro(P4Adapter *self, PyObject * nameObject, PyObject * value)
{
const char * name = GetPythonString(nameObject);
if (!name)
return -1;

// deletion is not supported
if (!value)
return PyErr_SetString(PyExc_AttributeError, "deletion not supported"), -1;

// Special case first:
// If there is a specific ObjectSetter for this name available use this one
Expand All @@ -724,7 +735,12 @@ static int P4Adapter_setattro(P4Adapter *self, PyObject * nameObject, PyObject *
if (PyInt_Check(value)) {
PythonClientAPI::intsetter isetter = self->clientAPI->GetIntSetter(name);
if (isetter) {
return (self->clientAPI->*isetter)(PyInt_AS_LONG(value));
long lval = PyInt_AsLong(value);
if (lval == -1 && PyErr_Occurred())
return -1;
if (lval < INT_MIN || lval > INT_MAX)
return PyErr_SetString(PyExc_OverflowError, "integer attribute value out of range"), -1;
return (self->clientAPI->*isetter)((int)lval);
}
else {
ostringstream os;
Expand Down Expand Up @@ -752,7 +768,10 @@ static int P4Adapter_setattro(P4Adapter *self, PyObject * nameObject, PyObject *
if (IsString(value)) {
PythonClientAPI::strsetter ssetter = self->clientAPI->GetStrSetter(name);
if (ssetter) {
return (self->clientAPI->*ssetter)(GetPythonString(value));
const char *cstr = GetPythonString(value);
if (!cstr)
return -1;
return (self->clientAPI->*ssetter)(cstr);
}
else {
ostringstream os;
Expand All @@ -765,7 +784,14 @@ static int P4Adapter_setattro(P4Adapter *self, PyObject * nameObject, PyObject *

// can only set int and string or certain object values -> bail out with exception
ostringstream os;
os << "Cannot set attribute : " << name << " with value " << GetPythonString(PyObject_Str(value));
PyObject *str = PyObject_Str(value);
const char *cstr = str ? GetPythonString(str) : 0;
if (!str || !cstr) {
Py_XDECREF(str);
return -1;
}
os << "Cannot set attribute : " << name << " with value " << cstr;
Py_DECREF(str);

PyErr_SetString(PyExc_AttributeError, os.str().c_str());
return -1;
Expand Down Expand Up @@ -1525,4 +1551,3 @@ initP4API(void)
return module;
#endif
}

13 changes: 12 additions & 1 deletion PythonClientAPI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -620,10 +620,21 @@ PyObject * PythonClientAPI::Convert(const char * charset, PyObject * content)
}

PyObject * bytes = PyUnicode_AsUTF8String(content);
if (!bytes) {
delete cvt;
return NULL;
}
Py_ssize_t slen = PyBytes_GET_SIZE(bytes);
if (slen > INT_MAX) {
PyErr_SetString(PyExc_OverflowError, "content overflow");
Py_DECREF(bytes);
delete cvt;
return NULL;
}
const char * contentAsUTF8 = PyBytes_AS_STRING(bytes);

int retlen = 0;
const char * converted = cvt->FastCvt(contentAsUTF8, (int)strlen(contentAsUTF8), &retlen);
const char * converted = cvt->FastCvt(contentAsUTF8, (int)slen, &retlen);
Py_DECREF( bytes ); // we do not need this object anymore

if (converted == NULL) {
Expand Down
2 changes: 1 addition & 1 deletion SpecMgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,7 @@ const char * GetPythonString(PyObject *obj) {
return PyUnicode_AsUTF8(obj);
}
else
return PyBytes_AS_STRING(obj);
return PyBytes_AsString(obj);
}

#endif
36 changes: 36 additions & 0 deletions p4test.py
Original file line number Diff line number Diff line change
Expand Up @@ -973,6 +973,42 @@ def testArguments( self ):
self.assertEqual(p4.port, "9999")
self.assertEqual(p4.client, "myclient")

def testAdapterAttributeErrorsAndBounds(self):
import ctypes

bits = ctypes.sizeof(ctypes.c_int) * 8
minimum, maximum = -(1 << (bits - 1)), (1 << (bits - 1)) - 1
for value in (minimum, maximum):
self.p4.maxresults = value
self.assertEqual(self.p4.maxresults, value)
self.assertEqual(P4API.P4Adapter(maxresults=value).maxresults, value)
for value in (minimum - 1, maximum + 1, -(1 << 100), 1 << 100):
with self.assertRaises(OverflowError):
self.p4.maxresults = value
with self.assertRaises(OverflowError):
P4API.P4Adapter(maxresults=value)

with self.assertRaises(AttributeError):
del self.p4.input
with self.assertRaises(UnicodeEncodeError):
setattr(self.p4, '\ud800', 1)
with self.assertRaises(UnicodeEncodeError):
self.p4.port = '\ud800'

class BadString:
def __str__(self):
raise ValueError("cannot stringify")

with self.assertRaisesRegex(ValueError, "cannot stringify"):
self.p4.port = BadString()

def testConvertContentLength(self):
adapter = P4API.P4Adapter()
convert = getattr(adapter, '__convert')
self.assertEqual(convert('iso8859-1', 'a\0b'), b'a\0b')
with self.assertRaises(UnicodeEncodeError):
convert('iso8859-1', '\ud800')

def testUnicode( self ):
self.enableUnicode()

Expand Down