Fixed crashes with uart_write and generic_api_send_command

Signed-off-by: David Rebbe <drebbe@intrepidcs.com>

Author: drebbe-intrepid

src/methods.cpp

@@ -3740,53 +3740,42 @@ PyObject* meth_uart_write(PyObject* self, PyObject* args)
 {
     PyObject* obj = NULL;
     EUartPort_t port = eUART0;
-    PyObject* data = NULL;
+    const char* data = NULL;
+    Py_ssize_t data_len = 0;
     uint8_t flags = 0;
     bool check_size = true;
-    if (!PyArg_ParseTuple(args, arg_parse("OIy*|bp:", __FUNCTION__), &obj, &port, &data, &flags, &check_size)) {
+    if (!PyArg_ParseTuple(args, arg_parse("OIy#|bp:", __FUNCTION__), &obj, &port, &data, &data_len, &flags, &check_size)) {
         return NULL;
     }
-    // Check if the data buffer is valid and grab the buffer
-    if (!PyObject_CheckBuffer(data)) {
-        return set_ics_exception(exception_runtime_error(), "Argument 'data' must be of type 'bytes'");
-    }
-    Py_buffer data_buffer = {};
-    PyObject_GetBuffer(data, &data_buffer, PyBUF_C_CONTIGUOUS | PyBUF_WRITABLE);
 
     // Get the device handle
     if (!PyNeoDevice_CheckExact(obj)) {
-        PyBuffer_Release(&data_buffer);
         return set_ics_exception(exception_runtime_error(), "Argument must be of type " MODULE_NAME "." NEO_DEVICE_OBJECT_NAME);
     }
     ICS_HANDLE handle = PyNeoDevice_GetHandle(obj);
     try
     {
         ice::Library* lib = dll_get_library();
         if (!lib) {
-            PyBuffer_Release(&data_buffer);
             char buffer[512];
             return set_ics_exception(exception_runtime_error(), dll_get_error(buffer));
         }
         // int _stdcall icsneoUartWrite(void* hObject, const EUartPort_t uart, const void* bData, const size_t bytesToSend, size_t* bytesActuallySent, uint8_t* flags)
         size_t bytesActuallySent = 0;
         ice::Function<int __stdcall (ICS_HANDLE, const EUartPort_t, const void*, const size_t, size_t*, uint8_t*)> icsneoUartWrite(lib, "icsneoUartWrite");
         Py_BEGIN_ALLOW_THREADS
-            if (!icsneoUartWrite(handle, port, data_buffer.buf, data_buffer.len, &bytesActuallySent, &flags)) {
+            if (!icsneoUartWrite(handle, port, data, data_len, &bytesActuallySent, &flags)) {
                 Py_BLOCK_THREADS
-                PyBuffer_Release(&data_buffer);
                 return set_ics_exception(exception_runtime_error(), "icsneoUartWrite() Failed");
             }
         Py_END_ALLOW_THREADS
-        if (check_size && data_buffer.len != bytesActuallySent) {
-            PyBuffer_Release(&data_buffer);
+        if (check_size && data_len != bytesActuallySent) {
             return set_ics_exception(exception_runtime_error(), "Bytes actually sent didn't match bytes to send length");
         }
-        PyBuffer_Release(&data_buffer);
         return Py_BuildValue("i", bytesActuallySent);
     }
     catch (ice::Exception& ex)
     {
-        PyBuffer_Release(&data_buffer);
         return set_ics_exception(exception_runtime_error(), (char*)ex.what());
     }
     return set_ics_exception(exception_runtime_error(), "This is a bug!");
@@ -3928,27 +3917,20 @@ PyObject* meth_generic_api_send_command(PyObject* self, PyObject* args)
     unsigned char apiIndex = 0;
     unsigned char instanceIndex = 0;
     unsigned char functionIndex = 0;
-    PyObject* data = NULL;
-    if (!PyArg_ParseTuple(args, arg_parse("Obbby*:", __FUNCTION__), &obj, &apiIndex, &instanceIndex, &functionIndex, data)) {
+    const char* data = NULL;
+    Py_ssize_t data_len = 0;
+    if (!PyArg_ParseTuple(args, arg_parse("Obbby#:", __FUNCTION__), &obj, &apiIndex, &instanceIndex, &functionIndex, data, &data_len)) {
         return NULL;
     }
-    // Check if the data buffer is valid and grab the buffer
-    if (!PyObject_CheckBuffer(data)) {
-        return set_ics_exception(exception_runtime_error(), "Argument 'data' must be of type 'bytes'");
-    }
-    Py_buffer data_buffer = {};
-    PyObject_GetBuffer(data, &data_buffer, PyBUF_C_CONTIGUOUS | PyBUF_WRITABLE);
     // Get the device handle
     if (!PyNeoDevice_CheckExact(obj)) {
-        PyBuffer_Release(&data_buffer);
         return set_ics_exception(exception_runtime_error(), "Argument must be of type " MODULE_NAME "." NEO_DEVICE_OBJECT_NAME);
     }
     ICS_HANDLE handle = PyNeoDevice_GetHandle(obj);
     try
     {
         ice::Library* lib = dll_get_library();
         if (!lib) {
-            PyBuffer_Release(&data_buffer);
             char buffer[512];
             return set_ics_exception(exception_runtime_error(), dll_get_error(buffer));
         }
@@ -3964,19 +3946,16 @@ PyObject* meth_generic_api_send_command(PyObject* self, PyObject* args)
         ice::Function<int __stdcall (ICS_HANDLE, unsigned char, unsigned char, unsigned char, void*, unsigned int, unsigned char*)> icsneoGenericAPISendCommand(lib, "icsneoGenericAPISendCommand");
         unsigned char functionError = 0;
         Py_BEGIN_ALLOW_THREADS
-            if (!icsneoGenericAPISendCommand(handle, apiIndex, instanceIndex, functionIndex, data_buffer.buf, data_buffer.len, &functionError)) {
-                PyBuffer_Release(&data_buffer);
+            if (!icsneoGenericAPISendCommand(handle, apiIndex, instanceIndex, functionIndex, (void*)data, data_len, &functionError)) {
                 Py_BLOCK_THREADS
                 return set_ics_exception(exception_runtime_error(), "icsneoGenericAPISendCommand() Failed");
             }
         Py_END_ALLOW_THREADS
-        PyBuffer_Release(&data_buffer);
         return Py_BuildValue("i", functionError);
 
     }
     catch (ice::Exception& ex)
     {
-        PyBuffer_Release(&data_buffer);
         return set_ics_exception(exception_runtime_error(), (char*)ex.what());
     }
     return set_ics_exception(exception_runtime_error(), "This is a bug!");
@@ -3987,7 +3966,6 @@ PyObject* meth_generic_api_read_data(PyObject* self, PyObject* args)
     PyObject* obj = NULL;
     unsigned char apiIndex = 0;
     unsigned char instanceIndex = 0;
-    //PyObject* data = NULL;
     unsigned int length = 0;
     if (!PyArg_ParseTuple(args, arg_parse("ObbI:", __FUNCTION__), &obj, &apiIndex, &instanceIndex, &length)) {
         return NULL;