traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Undo needless INCREF chicanery introduced by SF patch #450702. 

Apparently this patch (rev 2.41) replaced all the good old "s#"
    formats in PyArg_ParseTuple() with "S".  Then it did
    PyString_FromStringAndSize() to get back the values setup by the
    "s#" format.  It also incref'd and decref'd the string obtained by
    "S" even though the argument tuple had a reference to it.

Replace PyString_AsString() calls with PyString_AS_STRING().

    A good rule of thumb -- if you never check the return value of
    PyString_AsString() to see if it's NULL, you ought to be using the
    macro <wink>.
This commit is contained in:
Jeremy Hylton 2001-10-16 23:26:08 +00:00
parent 9d620d018c
commit ba3dd9990f
1 changed files with 15 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
Modules/zlibmodule.c
View File

@ -136,14 +136,9 @@ PyZlib_compress(PyObject *self, PyObject *args)
Byte *input, *output; Byte *input, *output;
int length, level=Z_DEFAULT_COMPRESSION, err; int length, level=Z_DEFAULT_COMPRESSION, err;
z_stream zst; z_stream zst;
PyObject * inputString;
/* require Python string object, optional 'level' arg */ /* require Python string object, optional 'level' arg */
if (!PyArg_ParseTuple(args, "S|i:compress", &inputString, &level)) if (!PyArg_ParseTuple(args, "s#|i:compress", &input, &length, &level))
return NULL;
/* now get a pointer to the internal string */
if (PyString_AsStringAndSize(inputString, (char**)&input, &length) == -1)
return NULL; return NULL;
zst.avail_out = length + length/1000 + 12 + 1; zst.avail_out = length + length/1000 + 12 + 1;
@ -158,8 +153,6 @@ PyZlib_compress(PyObject *self, PyObject *args)
/* Past the point of no return. From here on out, we need to make sure /* Past the point of no return. From here on out, we need to make sure
we clean up mallocs & INCREFs. */ we clean up mallocs & INCREFs. */
Py_INCREF(inputString); /* increment so that we hold ref */
zst.zalloc = (alloc_func)NULL; zst.zalloc = (alloc_func)NULL;
zst.zfree = (free_func)Z_NULL; zst.zfree = (free_func)Z_NULL;
zst.next_out = (Byte *)output; zst.next_out = (Byte *)output;
@ -203,7 +196,6 @@ PyZlib_compress(PyObject *self, PyObject *args)
error: error:
free(output); free(output);
Py_DECREF(inputString);
return ReturnVal; return ReturnVal;
} }
@ -222,12 +214,9 @@ PyZlib_decompress(PyObject *self, PyObject *args)
int length, err; int length, err;
int wsize=DEF_WBITS, r_strlen=DEFAULTALLOC; int wsize=DEF_WBITS, r_strlen=DEFAULTALLOC;
z_stream zst; z_stream zst;
PyObject * inputString;
if (!PyArg_ParseTuple(args, "S|ii:decompress", if (!PyArg_ParseTuple(args, "s#|ii:decompress",
&inputString, &wsize, &r_strlen)) &input, &length, &wsize, &r_strlen))
return NULL;
if (PyString_AsStringAndSize(inputString, (char**)&input, &length) == -1)
return NULL; return NULL;
if (r_strlen <= 0) if (r_strlen <= 0)
@ -239,14 +228,9 @@ PyZlib_decompress(PyObject *self, PyObject *args)
if (!(result_str = PyString_FromStringAndSize(NULL, r_strlen))) if (!(result_str = PyString_FromStringAndSize(NULL, r_strlen)))
return NULL; return NULL;
/* Past the point of no return. From here on out, we need to make sure
we clean up mallocs & INCREFs. */
Py_INCREF(inputString); /* increment so that we hold ref */
zst.zalloc = (alloc_func)NULL; zst.zalloc = (alloc_func)NULL;
zst.zfree = (free_func)Z_NULL; zst.zfree = (free_func)Z_NULL;
zst.next_out = (Byte *)PyString_AsString(result_str); zst.next_out = (Byte *)PyString_AS_STRING(result_str);
zst.next_in = (Byte *)input; zst.next_in = (Byte *)input;
err = inflateInit2(&zst, wsize); err = inflateInit2(&zst, wsize);
@ -291,7 +275,7 @@ PyZlib_decompress(PyObject *self, PyObject *args)
result_str = NULL; result_str = NULL;
goto error; goto error;
} }
zst.next_out = (unsigned char *)PyString_AsString(result_str) \ zst.next_out = (unsigned char *)PyString_AS_STRING(result_str) \
+ r_strlen; + r_strlen;
zst.avail_out = r_strlen; zst.avail_out = r_strlen;
r_strlen = r_strlen << 1; r_strlen = r_strlen << 1;
@ -306,15 +290,13 @@ PyZlib_decompress(PyObject *self, PyObject *args)
err = inflateEnd(&zst); err = inflateEnd(&zst);
if (err != Z_OK) { if (err != Z_OK) {
zlib_error(zst, err, "while finishing data decompression"); zlib_error(zst, err, "while finishing data decompression");
return NULL; goto error;
} }
_PyString_Resize(&result_str, zst.total_out); _PyString_Resize(&result_str, zst.total_out);
Py_DECREF(inputString);
return result_str; return result_str;
error: error:
Py_DECREF(inputString);
Py_XDECREF(result_str); Py_XDECREF(result_str);
return NULL; return NULL;
} }
@ -433,12 +415,8 @@ PyZlib_objcompress(compobject *self, PyObject *args)
PyObject *RetVal; PyObject *RetVal;
Byte *input; Byte *input;
unsigned long start_total_out; unsigned long start_total_out;
PyObject *inputString;
if (!PyArg_ParseTuple(args, "S:compress", &inputString)) if (!PyArg_ParseTuple(args, "s#:compress", &input, &inplen))
return NULL;
if (PyString_AsStringAndSize(inputString, (char**)&input, &inplen) == -1)
return NULL; return NULL;
if (!(RetVal = PyString_FromStringAndSize(NULL, length))) if (!(RetVal = PyString_FromStringAndSize(NULL, length)))
@ -446,13 +424,11 @@ PyZlib_objcompress(compobject *self, PyObject *args)
ENTER_ZLIB ENTER_ZLIB
Py_INCREF(inputString);
start_total_out = self->zst.total_out; start_total_out = self->zst.total_out;
self->zst.avail_in = inplen; self->zst.avail_in = inplen;
self->zst.next_in = input; self->zst.next_in = input;
self->zst.avail_out = length; self->zst.avail_out = length;
self->zst.next_out = (unsigned char *)PyString_AsString(RetVal); self->zst.next_out = (unsigned char *)PyString_AS_STRING(RetVal);
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
err = deflate(&(self->zst), Z_NO_FLUSH); err = deflate(&(self->zst), Z_NO_FLUSH);
@ -465,7 +441,7 @@ PyZlib_objcompress(compobject *self, PyObject *args)
RetVal = NULL; RetVal = NULL;
goto error; goto error;
} }
self->zst.next_out = (unsigned char *)PyString_AsString(RetVal) \ self->zst.next_out = (unsigned char *)PyString_AS_STRING(RetVal) \
+ length; + length;
self->zst.avail_out = length; self->zst.avail_out = length;
length = length << 1; length = length << 1;
@ -490,7 +466,6 @@ PyZlib_objcompress(compobject *self, PyObject *args)
RetVal = NULL; RetVal = NULL;
error: error:
Py_DECREF(inputString);
LEAVE_ZLIB LEAVE_ZLIB
return RetVal; return RetVal;
} }
@ -514,9 +489,9 @@ PyZlib_objdecompress(compobject *self, PyObject *args)
PyObject *RetVal; PyObject *RetVal;
Byte *input; Byte *input;
unsigned long start_total_out; unsigned long start_total_out;
PyObject * inputString;
if (!PyArg_ParseTuple(args, "S|i:decompress", &inputString, &max_length)) if (!PyArg_ParseTuple(args, "s#|i:decompress", &input,
&inplen, &max_length))
return NULL; return NULL;
if (max_length < 0) { if (max_length < 0) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
@ -524,9 +499,6 @@ PyZlib_objdecompress(compobject *self, PyObject *args)
return NULL; return NULL;
} }
if (PyString_AsStringAndSize(inputString, (char**)&input, &inplen) == -1)
return NULL;
/* limit amount of data allocated to max_length */ /* limit amount of data allocated to max_length */
if (max_length && length > max_length) if (max_length && length > max_length)
length = max_length; length = max_length;
@ -535,13 +507,11 @@ PyZlib_objdecompress(compobject *self, PyObject *args)
ENTER_ZLIB ENTER_ZLIB
Py_INCREF(inputString);
start_total_out = self->zst.total_out; start_total_out = self->zst.total_out;
self->zst.avail_in = inplen; self->zst.avail_in = inplen;
self->zst.next_in = input; self->zst.next_in = input;
self->zst.avail_out = length; self->zst.avail_out = length;
self->zst.next_out = (unsigned char *)PyString_AsString(RetVal); self->zst.next_out = (unsigned char *)PyString_AS_STRING(RetVal);
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
err = inflate(&(self->zst), Z_SYNC_FLUSH); err = inflate(&(self->zst), Z_SYNC_FLUSH);
@ -567,7 +537,7 @@ PyZlib_objdecompress(compobject *self, PyObject *args)
RetVal = NULL; RetVal = NULL;
goto error; goto error;
} }
self->zst.next_out = (unsigned char *)PyString_AsString(RetVal) \ self->zst.next_out = (unsigned char *)PyString_AS_STRING(RetVal) \
+ old_length; + old_length;
self->zst.avail_out = length - old_length; self->zst.avail_out = length - old_length;
@ -618,8 +588,6 @@ PyZlib_objdecompress(compobject *self, PyObject *args)
RetVal = NULL; RetVal = NULL;
error: error:
Py_DECREF(inputString);
LEAVE_ZLIB LEAVE_ZLIB
return RetVal; return RetVal;
@ -658,7 +626,7 @@ PyZlib_flush(compobject *self, PyObject *args)
start_total_out = self->zst.total_out; start_total_out = self->zst.total_out;
self->zst.avail_in = 0; self->zst.avail_in = 0;
self->zst.avail_out = length; self->zst.avail_out = length;
self->zst.next_out = (unsigned char *)PyString_AsString(RetVal); self->zst.next_out = (unsigned char *)PyString_AS_STRING(RetVal);
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
err = deflate(&(self->zst), flushmode); err = deflate(&(self->zst), flushmode);
@ -671,7 +639,7 @@ PyZlib_flush(compobject *self, PyObject *args)
RetVal = NULL; RetVal = NULL;
goto error; goto error;
} }
self->zst.next_out = (unsigned char *)PyString_AsString(RetVal) \ self->zst.next_out = (unsigned char *)PyString_AS_STRING(RetVal) \
+ length; + length;
self->zst.avail_out = length; self->zst.avail_out = length;
length = length << 1; length = length << 1;