Make arrange functions pure C so a pure C variable instead of a PyObject variable is returned

Author: rhpvorderman

src/isal/isal_zlib.pyx

@@ -136,17 +136,17 @@ cdef Py_ssize_t py_ssize_t_min(Py_ssize_t a, Py_ssize_t b):
     else:
         return b
 
-cdef arrange_output_buffer_with_maximum(stream_or_state *stream,
-                                        unsigned char **buffer,
-                                        Py_ssize_t length,
-                                        Py_ssize_t max_length):
+cdef Py_ssize_t arrange_output_buffer_with_maximum(stream_or_state *stream,
+                                                   unsigned char **buffer,
+                                                   Py_ssize_t length,
+                                                   Py_ssize_t max_length):
     cdef Py_ssize_t occupied
     cdef Py_ssize_t new_length
     cdef unsigned char * new_buffer
     if buffer[0] == NULL:
         buffer[0] = <unsigned char*>PyMem_Malloc(length * sizeof(char))
         if buffer[0] == NULL:
-            raise MemoryError("Unsufficient memory for buffer allocation")
+            return -1
         occupied = 0
     else:
         occupied = stream.next_out - buffer[0]
@@ -159,18 +159,20 @@ cdef arrange_output_buffer_with_maximum(stream_or_state *stream,
                 new_length = max_length
             new_buffer = <unsigned char *>PyMem_Realloc(buffer[0], new_length)
             if new_buffer == NULL:
-                raise MemoryError("Unssufficient memory for buffer allocation")
+                return -1
             buffer[0] = new_buffer
             length = new_length
     stream.avail_out = <unsigned int>py_ssize_t_min(length - occupied, UINT32_MAX)
     stream.next_out = buffer[0] + occupied
     return length
 
-cdef arrange_output_buffer(stream_or_state *stream, unsigned char **buffer, Py_ssize_t length):
+cdef Py_ssize_t arrange_output_buffer(stream_or_state *stream,
+                                      unsigned char **buffer,
+                                      Py_ssize_t length):
     cdef Py_ssize_t ret
     ret = arrange_output_buffer_with_maximum(stream, buffer, length, PY_SSIZE_T_MAX)
-    if ret == -2:
-        raise MemoryError("Output buffer has reached maximum size")
+    if ret == -2:  # Maximum reached.
+        return -1
     return ret
 
 cdef void arrange_input_buffer(stream_or_state *stream, Py_ssize_t *remains):
@@ -242,6 +244,8 @@ def compress(data,
             # this loop still needs to run one time.
             while True:
                 bufsize = arrange_output_buffer(&stream, &obuf, bufsize)
+                if bufsize == -1:
+                    raise MemoryError("Unsufficient memory for buffer allocation")
                 err = isal_deflate(&stream)
                 if err != COMP_OK:
                     # There is some python interacting when possible exceptions
@@ -310,6 +314,8 @@ def decompress(data,
             # to be called again.
             while True:
                 bufsize = arrange_output_buffer(&stream, &obuf, bufsize)
+                if bufsize == -1:
+                    raise MemoryError("Unsufficient memory for buffer allocation")
                 err = isal_inflate(&stream)
                 if err != ISAL_DECOMP_OK:
                     # There is some python interacting when possible exceptions
@@ -448,6 +454,8 @@ cdef class Compress:
                 arrange_input_buffer(&self.stream, &ibuflen)
                 while True: #self.stream.avail_in != 0:
                     obuflen = arrange_output_buffer(&self.stream, &obuf, obuflen)
+                    if obuflen== -1:
+                        raise MemoryError("Unsufficient memory for buffer allocation")
                     err = isal_deflate(&self.stream)
                     if err != COMP_OK:
                         # There is some python interacting when possible exceptions
@@ -495,6 +503,8 @@ cdef class Compress:
         try:
             while True:
                 length = arrange_output_buffer(&self.stream, &obuf, length)
+                if length == -1:
+                    raise MemoryError("Unsufficient memory for buffer allocation")
                 err = isal_deflate(&self.stream)
                 if err != COMP_OK:
                     # There is some python interacting when possible exceptions
@@ -630,7 +640,9 @@ cdef class Decompress:
                 while True:#(self.stream.avail_out == 0 or self.stream.avail_in != 0):
                     obuflen = arrange_output_buffer_with_maximum(
                               &self.stream, &obuf, obuflen, hard_limit)
-                    if obuflen == -2:
+                    if obuflen == -1:
+                        raise MemoryError("Unsufficient memory for buffer allocation")
+                    elif obuflen == -2:
                         max_length_reached = True
                         break
                     err = isal_inflate(&self.stream)
@@ -677,6 +689,8 @@ cdef class Decompress:
                 arrange_input_buffer(&self.stream, &ibuflen)
                 while True:
                     obuflen = arrange_output_buffer(&self.stream, &obuf, obuflen)
+                    if obuflen == -1:
+                        raise MemoryError("Unsufficient memory for buffer allocation")
                     err = isal_inflate(&self.stream)
                     if err != ISAL_DECOMP_OK:
                         # There is some python interacting when possible exceptions