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_compressobj.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$
  *
  */
@@ -47,17 +47,17 @@ pylzma_comp_compress(CCompressionObject *self, PyObject *args)
     PyObject *result = NULL;
     char *data;
     PARSE_LENGTH_TYPE length;
-    PY_LONG_LONG bufsize=BLOCK_SIZE;
+    Py_ssize_t bufsize=BLOCK_SIZE;
     int res;
     size_t before;
-    
-    if (!PyArg_ParseTuple(args, "s#|L", &data, &length, &bufsize))
+
+    if (!PyArg_ParseTuple(args, "s#|n", &data, &length, &bufsize))
         return NULL;
-    
+
     if (!MemoryInOutStreamAppend(&self->inStream, (Byte *) data, length)) {
         return PyErr_NoMemory();
     }
-    
+
     Py_BEGIN_ALLOW_THREADS
     while (1) {
         before = self->inStream.avail;
@@ -71,17 +71,17 @@ pylzma_comp_compress(CCompressionObject *self, PyObject *args)
         PyErr_Format(PyExc_TypeError, "Error during compressing: %d", res);
         return NULL;
     }
-    
-    length = min(self->outStream.size, bufsize);
+
+    length = min(self->outStream.size, (size_t)bufsize);
     result = PyString_FromStringAndSize((const char *)self->outStream.data, length);
     if (result != NULL) {
         MemoryOutStreamDiscard(&self->outStream, length);
     }
-    
+
     return result;
 }
 
-static char 
+static char
 doc_comp_flush[] = \
     "flush() -- Finishes the compression and returns any remaining compressed data.";
 
@@ -90,7 +90,7 @@ pylzma_comp_flush(CCompressionObject *self, PyObject *args)
 {
     PyObject *result;
     int res;
-    
+
     Py_BEGIN_ALLOW_THREADS
     while (1) {
         res = LzmaEnc_CodeOneBlock(self->encoder, False, 0, 0);
@@ -103,13 +103,13 @@ pylzma_comp_flush(CCompressionObject *self, PyObject *args)
         PyErr_Format(PyExc_TypeError, "Error during compressing: %d", res);
         return NULL;
     }
-    
+
     LzmaEnc_Finish(self->encoder);
     result = PyString_FromStringAndSize((const char *) self->outStream.data, self->outStream.size);
     if (result != NULL) {
         MemoryOutStreamDiscard(&self->outStream, self->outStream.size);
     }
-    
+
     return result;
 }
 
@@ -140,7 +140,7 @@ pylzma_comp_init(CCompressionObject *self, PyObject *args, PyObject *kwargs)
     Byte header[LZMA_PROPS_SIZE];
     size_t headerSize = LZMA_PROPS_SIZE;
     int result=-1;
-    
+
     // possible keywords for this function
     static char *kwlist[] = {"dictionary", "fastBytes", "literalContextBits",
                              "literalPosBits", "posBits", "algorithm", "eos", "multithreading", "matchfinder", NULL};
@@ -154,11 +154,11 @@ pylzma_comp_init(CCompressionObject *self, PyObject *args, PyObject *kwargs)
     char *matchfinder = NULL;    // matchfinder algorithm
     int algorithm = 2;
     int res;
-    
+
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|iiiiiiiis", kwlist, &dictionary, &fastBytes,
                                                                  &literalContextBits, &literalPosBits, &posBits, &algorithm, &eos, &multithreading, &matchfinder))
         return -1;
-    
+
     CHECK_RANGE(dictionary,         0,  28, "dictionary must be between 0 and 28");
     CHECK_RANGE(fastBytes,          5, 255, "fastBytes must be between 5 and 255");
     CHECK_RANGE(literalContextBits, 0,   8, "literalContextBits must be between 0 and 8");
@@ -172,15 +172,15 @@ pylzma_comp_init(CCompressionObject *self, PyObject *args, PyObject *kwargs)
         PyErr_Warn(PyExc_DeprecationWarning, "matchfinder selection is deprecated and will be ignored");
 #endif
     }
-    
+
     self->encoder = LzmaEnc_Create(&allocator);
     if (self->encoder == NULL) {
         PyErr_NoMemory();
         return -1;
     }
-    
+
     LzmaEncProps_Init(&props);
-    
+
     props.dictSize = 1 << dictionary;
     props.lc = literalContextBits;
     props.lp = literalPosBits;
@@ -207,10 +207,10 @@ pylzma_comp_init(CCompressionObject *self, PyObject *args, PyObject *kwargs)
         PyErr_SetString(PyExc_TypeError, "could not generate stream header");
         goto exit;
     }
-    
+
     LzmaEnc_Prepare(self->encoder, &self->inStream.s, &self->outStream.s, &allocator, &allocator);
     result = 0;
-    
+
 exit:
     return result;
 }

src/pylzma/pylzma_decompress.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$
  *
  */
@@ -45,7 +45,7 @@ pylzma_decompress(PyObject *self, PyObject *args, PyObject *kwargs)
     Byte *tmp;
     PARSE_LENGTH_TYPE length;
     int bufsize=BLOCK_SIZE;
-    PY_LONG_LONG totallength=-1;
+    Py_ssize_t totallength=-1;
     int lzma2 = 0;
     PARSE_LENGTH_TYPE avail;
     PyObject *result=NULL;
@@ -60,8 +60,8 @@ pylzma_decompress(PyObject *self, PyObject *args, PyObject *kwargs)
     int propertiesLength;
     // possible keywords for this function
     static char *kwlist[] = {"data", "bufsize", "maxlength", "lzma2", NULL};
-    
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s#|iLi", kwlist, &data, &length, &bufsize, &totallength, &lzma2))
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s#|ini", kwlist, &data, &length, &bufsize, &totallength, &lzma2))
         return NULL;
 
     propertiesLength = lzma2 ? 1 : LZMA_PROPS_SIZE;
@@ -72,10 +72,10 @@ pylzma_decompress(PyObject *self, PyObject *args, PyObject *kwargs)
         if (result == NULL) {
             return NULL;
         }
-        
+
         tmp = (Byte *) PyBytes_AS_STRING(result);
         srcLen = length - propertiesLength;
-        destLen = totallength;
+        destLen = (size_t)totallength;
         Py_BEGIN_ALLOW_THREADS
         if (lzma2) {
             res = Lzma2Decode(tmp, &destLen, (Byte *) (data + propertiesLength), &srcLen, data[0], LZMA_FINISH_ANY, &status, &allocator);
@@ -92,7 +92,7 @@ pylzma_decompress(PyObject *self, PyObject *args, PyObject *kwargs)
         }
         return result;
     }
-    
+
     CreateMemoryOutStream(&outStream);
     tmp = (Byte *) malloc(bufsize);
     if (tmp == NULL) {
@@ -126,7 +126,7 @@ pylzma_decompress(PyObject *self, PyObject *args, PyObject *kwargs)
     for (;;) {
         srcLen = avail;
         destLen = bufsize;
-        
+
         if (lzma2) {
             res = Lzma2Dec_DecodeToBuf(&state.lzma2, tmp, &destLen, data, &srcLen, LZMA_FINISH_ANY, &status);
         } else {
@@ -140,18 +140,18 @@ pylzma_decompress(PyObject *self, PyObject *args, PyObject *kwargs)
         if (res != SZ_OK || status == LZMA_STATUS_FINISHED_WITH_MARK || status == LZMA_STATUS_NEEDS_MORE_INPUT) {
             break;
         }
-        
+
     }
     Py_END_ALLOW_THREADS
-    
+
     if (status == LZMA_STATUS_NEEDS_MORE_INPUT) {
         PyErr_SetString(PyExc_ValueError, "data error during decompression");
     } else if (res != SZ_OK) {
         PyErr_Format(PyExc_TypeError, "Error while decompressing: %d", res);
     } else {
         result = PyBytes_FromStringAndSize((const char *) outStream.data, outStream.size);
     }
-    
+
 exit:
     if (outStream.data != NULL) {
         free(outStream.data);
@@ -162,6 +162,6 @@ pylzma_decompress(PyObject *self, PyObject *args, PyObject *kwargs)
         LzmaDec_Free(&state.lzma, &allocator);
     }
     free(tmp);
-    
+
     return result;
 }

src/pylzma/pylzma_decompress_compat.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$
  *
  */
@@ -33,7 +33,7 @@ void free_lzma_stream(lzma_stream *stream)
     if (stream->dynamicData)
         lzmafree(stream->dynamicData);
     stream->dynamicData = NULL;
-    
+
     if (stream->dictionary)
         lzmafree(stream->dictionary);
     stream->dictionary = NULL;
@@ -47,35 +47,40 @@ PyObject *pylzma_decompress_compat(PyObject *self, PyObject *args)
 {
     char *data;
     PARSE_LENGTH_TYPE length;
-    PY_LONG_LONG blocksize=BLOCK_SIZE;
+    Py_ssize_t blocksize=BLOCK_SIZE;
     PyObject *result = NULL;
     lzma_stream stream;
     int res;
     char *output;
-    
-    if (!PyArg_ParseTuple(args, "s#|L", &data, &length, &blocksize))
+
+    if (!PyArg_ParseTuple(args, "s#|n", &data, &length, &blocksize))
+        return NULL;
+
+    if (blocksize <= 0) {
+        PyErr_SetString(PyExc_ValueError, "bufsize must be greater than zero");
         return NULL;
-    
+    }
+
     memset(&stream, 0, sizeof(stream));
     if (!(output = (char *)malloc(blocksize)))
     {
         PyErr_NoMemory();
         goto exit;
     }
-    
+
     lzmaCompatInit(&stream);
     stream.next_in = (Byte *)data;
     stream.avail_in = length;
     stream.next_out = (Byte *)output;
     stream.avail_out = blocksize;
-    
+
     // decompress data
     while (1)
     {
         Py_BEGIN_ALLOW_THREADS
         res = lzmaCompatDecode(&stream);
         Py_END_ALLOW_THREADS
-        
+
         if (res == LZMA_STREAM_END) {
             break;
         } else if (res == LZMA_NOT_ENOUGH_MEM) {
@@ -98,19 +103,19 @@ PyObject *pylzma_decompress_compat(PyObject *self, PyObject *args)
             PyErr_Format(PyExc_ValueError, "unknown return code from lzmaDecode: %d", res);
             goto exit;
         }
-        
+
         // if we exit here, decompression finished without returning LZMA_STREAM_END
         // XXX: why is this sometimes?
         if (stream.avail_in == 0)
             break;
     }
 
     result = PyBytes_FromStringAndSize(output, stream.totalOut);
-    
+
 exit:
     free_lzma_stream(&stream);
     if (output != NULL)
         free(output);
-    
+
     return result;
 }