diff options
author | Louis Verhaard <louis.verhaard@arm.com> | 2021-01-22 14:11:15 +0100 |
---|---|---|
committer | Louis Verhaard <louis.verhaard@arm.com> | 2021-01-28 08:36:03 +0100 |
commit | 60232140a2927865d1f6f9bc48871df3b2bb135b (patch) | |
tree | 69f88870c51212ed2cfe53aa40b419fa773281a7 /ethosu/mlw_codec/mlw_codecmodule.c | |
parent | b21837638cf6cb015f2a1deb1bb81176e620a306 (diff) | |
download | ethos-u-vela-60232140a2927865d1f6f9bc48871df3b2bb135b.tar.gz |
MLBEDSW-3832: mlw_codec: improve C API
- Removed unnecessary casts
- Added more error handling
Signed-off-by: Louis Verhaard <louis.verhaard@arm.com>
Change-Id: I30cc37a2fb1e855b9f67599c280c1f383f0b059e
Diffstat (limited to 'ethosu/mlw_codec/mlw_codecmodule.c')
-rw-r--r-- | ethosu/mlw_codec/mlw_codecmodule.c | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/ethosu/mlw_codec/mlw_codecmodule.c b/ethosu/mlw_codec/mlw_codecmodule.c index 6dde12dc..2c2fba2c 100644 --- a/ethosu/mlw_codec/mlw_codecmodule.c +++ b/ethosu/mlw_codec/mlw_codecmodule.c @@ -53,9 +53,10 @@ method_encode (PyObject *self, PyObject *args) return NULL; /* Unpack the length of the input integer list. */ - int input_length = (int)PyObject_Length (input_list_object); - if (input_length < 0) - input_length = 0; + Py_ssize_t input_length = PyObject_Length (input_list_object); + if (input_length < 0) { + return NULL; + } /* We need to marshall the integer list into an input buffer * suitable for mlw_encode, use a temporary heap allocated buffer @@ -71,15 +72,22 @@ method_encode (PyObject *self, PyObject *args) { PyObject *item; item = PyList_GetItem(input_list_object, i); - if (!PyLong_Check(item)) - input_buffer[i] = 0; - input_buffer[i] = (int16_t)PyLong_AsLong(item); + long value = PyLong_AsLong(item); + if (value < -255 || value > 255) { + PyErr_SetString(PyExc_ValueError, "Input value out of bounds"); + return NULL; + } + input_buffer[i] = value; } + if (PyErr_Occurred() != NULL) { + PyErr_SetString(PyExc_ValueError, "Invalid input"); + return NULL; + } /* We don't know the output length required, we guess worst case, * the mlw_encode call will do a resize (downwards) anyway. */ - uint8_t *output_buffer = malloc(input_length); + uint8_t *output_buffer = (uint8_t *) malloc(input_length); if (output_buffer == NULL) return PyErr_NoMemory(); @@ -126,13 +134,13 @@ method_decode(PyObject *self, PyObject *args) /* Unpack the input buffer and length from the bytearray object. */ uint8_t *input_buffer = (uint8_t *) PyByteArray_AsString(input_bytearray_object); - int input_length = (int)PyByteArray_Size(input_bytearray_object); + Py_ssize_t input_length = PyByteArray_Size(input_bytearray_object); /* We don't know the output length required, we guess, but the guess * will be too small, the mlw_decode call will do a resize (upwards) * anyway. */ - int16_t *output_buffer = malloc (input_length); + int16_t *output_buffer = (int16_t *) malloc (input_length); if (output_buffer == NULL) return PyErr_NoMemory(); |