Fix different signedness comparisons.

Author: fancycode

src/pylzma/pylzma.c

@@ -469,7 +469,7 @@ pylzma_ppmd_decompress(PyObject *self, PyObject *args)
         }
         if (i != outsize) {
             res = (s.res != SZ_OK ? s.res : SZ_ERROR_DATA);
-        } else if (s.processed + (s.cur - s.begin) != length || !Ppmd7z_RangeDec_IsFinishedOK(&rc)) {
+        } else if (s.processed + (s.cur - s.begin) != (UInt64)length || !Ppmd7z_RangeDec_IsFinishedOK(&rc)) {
             res = SZ_ERROR_DATA;
         }
     }

src/pylzma/pylzma_decompressobj.c

@@ -9,16 +9,16 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  * $Id$
  *
  */
@@ -31,20 +31,20 @@
 static int
 pylzma_decomp_init(CDecompressionObject *self, PyObject *args, PyObject *kwargs)
 {
-    PY_LONG_LONG max_length = -1;
+    Py_ssize_t max_length = -1;
     int lzma2 = 0;
-    
+
     // possible keywords for this function
     static char *kwlist[] = {"maxlength", "lzma2", NULL};
-    
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Li", kwlist, &max_length, &lzma2))
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|ni", kwlist, &max_length, &lzma2))
         return -1;
-    
+
     if (max_length == 0 || max_length < -1) {
         PyErr_SetString(PyExc_ValueError, "the decompressed size must be greater than zero");
         return -1;
     }
-    
+
     self->unconsumed_tail = NULL;
     self->unconsumed_length = 0;
     self->need_properties = 1;
@@ -72,30 +72,30 @@ pylzma_decomp_decompress(CDecompressionObject *self, PyObject *args)
     Byte *next_in, *next_out;
     PARSE_LENGTH_TYPE length;
     int res;
-    PY_LONG_LONG bufsize=BLOCK_SIZE;
+    Py_ssize_t bufsize=BLOCK_SIZE;
     SizeT avail_in;
     SizeT inProcessed, outProcessed;
     ELzmaStatus status;
-    
-    if (!PyArg_ParseTuple(args, "s#|L", &data, &length, &bufsize)){
+
+    if (!PyArg_ParseTuple(args, "s#|n", &data, &length, &bufsize)){
         return NULL;
     }
 
     if (bufsize <= 0) {
         PyErr_SetString(PyExc_ValueError, "bufsize must be greater than zero");
         return NULL;
     }
-    
+
     if (self->unconsumed_length > 0) {
         self->unconsumed_tail = (unsigned char *) realloc(self->unconsumed_tail, self->unconsumed_length + length);
         next_in = (unsigned char *) self->unconsumed_tail;
         memcpy(next_in + self->unconsumed_length, data, length);
     } else {
         next_in = data;
     }
-    
+
     if (self->need_properties) {
-        int propertiesLength = self->lzma2 ? 1 : LZMA_PROPS_SIZE;
+        SizeT propertiesLength = self->lzma2 ? 1 : LZMA_PROPS_SIZE;
         if ((self->unconsumed_length + length) < propertiesLength) {
             // we need enough bytes to read the properties
             self->unconsumed_tail = (unsigned char *) realloc(self->unconsumed_tail, self->unconsumed_length + length);
@@ -118,7 +118,7 @@ pylzma_decomp_decompress(CDecompressionObject *self, PyObject *args)
             PyErr_SetString(PyExc_TypeError, "Incorrect stream properties");
             return NULL;
         }
-        
+
         next_in += propertiesLength;
         self->unconsumed_length -= propertiesLength;
         if (self->unconsumed_length > 0) {
@@ -143,7 +143,7 @@ pylzma_decomp_decompress(CDecompressionObject *self, PyObject *args)
         } else {
             FREE_AND_NULL(self->unconsumed_tail);
         }
-        
+
         self->need_properties = 0;
         if (self->lzma2) {
             Lzma2Dec_Init(&self->state.lzma2);
@@ -158,13 +158,13 @@ pylzma_decomp_decompress(CDecompressionObject *self, PyObject *args)
         // no more bytes to decompress
         return PyBytes_FromString("");
     }
-    
+
     result = PyBytes_FromStringAndSize(NULL, bufsize);
     if (result == NULL) {
         PyErr_NoMemory();
         goto exit;
     }
-    
+
     next_out = (unsigned char *) PyBytes_AS_STRING(result);
     Py_BEGIN_ALLOW_THREADS
     // Decompress until EOS marker is reached
@@ -181,7 +181,7 @@ pylzma_decomp_decompress(CDecompressionObject *self, PyObject *args)
     self->total_out += outProcessed;
     next_in += inProcessed;
     avail_in -= inProcessed;
-    
+
     if (res != SZ_OK) {
         DEC_AND_NULL(result);
         PyErr_SetString(PyExc_ValueError, "data error during decompression");
@@ -207,10 +207,10 @@ pylzma_decomp_decompress(CDecompressionObject *self, PyObject *args)
     } else {
         FREE_AND_NULL(self->unconsumed_tail);
     }
-    
+
     self->unconsumed_length = avail_in;
     _PyBytes_Resize(&result, outProcessed);
-    
+
 exit:
     return result;
 }
@@ -224,27 +224,27 @@ pylzma_decomp_flush(CDecompressionObject *self, PyObject *args)
 {
     PyObject *result=NULL;
     int res;
-    SizeT avail_out, outsize;
+    Py_ssize_t avail_out, outsize;
     unsigned char *tmp;
     SizeT inProcessed, outProcessed;
     ELzmaStatus status;
-    
+
     if (self->max_length != -1) {
         avail_out = self->max_length - self->total_out;
     } else {
         avail_out = BLOCK_SIZE;
     }
-    
+
     if (avail_out == 0) {
         // no more remaining data
         return PyBytes_FromString("");
     }
-    
+
     result = PyBytes_FromStringAndSize(NULL, avail_out);
     if (result == NULL) {
         return NULL;
     }
-    
+
     tmp = (unsigned char *) PyBytes_AS_STRING(result);
     outsize = 0;
     while (1) {
@@ -278,46 +278,46 @@ pylzma_decomp_flush(CDecompressionObject *self, PyObject *args)
                 FREE_AND_NULL(self->unconsumed_tail);
         }
         Py_END_ALLOW_THREADS
-        
+
         if (res != SZ_OK) {
             PyErr_SetString(PyExc_ValueError, "data error during decompression");
             DEC_AND_NULL(result);
             goto exit;
         }
-        
+
         if (!outProcessed && self->max_length != -1 && self->total_out < self->max_length) {
             PyErr_SetString(PyExc_ValueError, "data error during decompression");
             DEC_AND_NULL(result);
             goto exit;
         }
-        
+
         self->total_out += outProcessed;
         outsize += outProcessed;
-        if (outProcessed < avail_out || (outProcessed == avail_out && self->max_length != -1)) {
+        if (outProcessed < (SizeT)avail_out || (outProcessed == (SizeT)avail_out && self->max_length != -1)) {
             break;
         }
-        
+
         if (self->max_length != -1) {
             PyErr_SetString(PyExc_ValueError, "not enough input data for decompression");
             DEC_AND_NULL(result);
             goto exit;
         }
-        
+
         avail_out -= outProcessed;
-        
+
         // Output buffer is full, might be more data for decompression
         if (_PyBytes_Resize(&result, outsize+BLOCK_SIZE) != 0) {
             goto exit;
         }
-        
+
         avail_out += BLOCK_SIZE;
         tmp = (unsigned char *) PyBytes_AS_STRING(result) + outsize;
     }
-    
+
     if (outsize != PyBytes_GET_SIZE(result)) {
         _PyBytes_Resize(&result, outsize);
     }
-    
+
 exit:
     return result;
 }
@@ -329,14 +329,14 @@ doc_decomp_reset[] = \
 static PyObject *
 pylzma_decomp_reset(CDecompressionObject *self, PyObject *args, PyObject *kwargs)
 {
-    PY_LONG_LONG max_length = -1;
-    
+    Py_ssize_t max_length = -1;
+
     // possible keywords for this function
     static char *kwlist[] = {"maxlength", NULL};
-    
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|L", kwlist, &max_length))
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|n", kwlist, &max_length))
         return NULL;
-    
+
     if (self->lzma2) {
         Lzma2Dec_Free(&self->state.lzma2, &allocator);
         Lzma2Dec_Construct(&self->state.lzma2);
@@ -349,7 +349,7 @@ pylzma_decomp_reset(CDecompressionObject *self, PyObject *args, PyObject *kwargs
     self->need_properties = 1;
     self->total_out = 0;
     self->max_length = max_length;
-    
+
     Py_INCREF(Py_None);
     return Py_None;
 }

src/pylzma/pylzma_decompressobj.h

@@ -9,16 +9,16 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  * $Id$
  *
  */
@@ -39,8 +39,8 @@ typedef struct {
       CLzma2Dec lzma2;
     } state;
     ELzmaStatus status;
-    SizeT max_length;
-    SizeT total_out;
+    Py_ssize_t max_length;
+    Py_ssize_t total_out;
     unsigned char *unconsumed_tail;
     SizeT unconsumed_length;
     int need_properties;

src/pylzma/pylzma_decompressobj_compat.h

@@ -9,16 +9,16 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  * $Id$
  *
  */
@@ -34,7 +34,7 @@ typedef struct {
     PyObject_HEAD
     lzma_stream stream;
     char *unconsumed_tail;
-    int unconsumed_length;
+    UInt32 unconsumed_length;
     PyObject *unused_data;
 } CCompatDecompressionObject;