diff options
| author | miwi <miwi@FreeBSD.org> | 2008-04-25 08:16:04 +0000 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2008-04-25 08:16:04 +0000 |
| commit | d59b4c02320fd85550e0487dcb3be2c627b1161a (patch) | |
| tree | 570440294ee28a9348c11fb43eff309ae833f91b /lang/python31 | |
| parent | 476440d2dd36216cf0d50af141271b68a6c4d95b (diff) | |
| download | FreeBSD-ports-d59b4c02320fd85550e0487dcb3be2c627b1161a.zip FreeBSD-ports-d59b4c02320fd85550e0487dcb3be2c627b1161a.tar.gz | |
- Fix zlib crash from zlib.decompressobj().flush(val)
when val was not positive. It tried to allocate negative
or zero memory. That fails.
- Bump PORTREVISION
Reviewed by: alexbl
Obtained from: python svn
Security: http://www.vuxml.org/freebsd/ec41c3e2-129c-11dd-bab7-0016179b2dd5.html
Diffstat (limited to 'lang/python31')
| -rw-r--r-- | lang/python31/Makefile | 2 | ||||
| -rw-r--r-- | lang/python31/files/patch-Lib-test-test_zlib.py | 14 | ||||
| -rw-r--r-- | lang/python31/files/patch-Modules-zlibmodule.c | 13 |
3 files changed, 28 insertions, 1 deletions
diff --git a/lang/python31/Makefile b/lang/python31/Makefile index 3e19ec1..087ddd1 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -6,7 +6,7 @@ PORTNAME= python25 PORTVERSION= 2.5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} diff --git a/lang/python31/files/patch-Lib-test-test_zlib.py b/lang/python31/files/patch-Lib-test-test_zlib.py new file mode 100644 index 0000000..425572d --- /dev/null +++ b/lang/python31/files/patch-Lib-test-test_zlib.py @@ -0,0 +1,14 @@ +--- Lib/test/test_zlib.py 2008/04/08 23:47:30 62234 ++++ Lib/test/test_zlib.py 2008/04/09 00:25:17 62235 +@@ -83,6 +83,11 @@ + # verify failure on building decompress object with bad params + self.assertRaises(ValueError, zlib.decompressobj, 0) + ++ def test_decompressobj_badflush(self): ++ # verify failure on calling decompressobj.flush with bad params ++ self.assertRaises(ValueError, zlib.decompressobj().flush, 0) ++ self.assertRaises(ValueError, zlib.decompressobj().flush, -1) ++ + + + class CompressTestCase(unittest.TestCase): diff --git a/lang/python31/files/patch-Modules-zlibmodule.c b/lang/python31/files/patch-Modules-zlibmodule.c new file mode 100644 index 0000000..7875a40 --- /dev/null +++ b/lang/python31/files/patch-Modules-zlibmodule.c @@ -0,0 +1,13 @@ +--- Modules/zlibmodule.c.orig 2008-04-25 01:47:26.000000000 +0200 ++++ Modules/zlibmodule.c 2008-04-25 01:48:17.000000000 +0200 +@@ -774,6 +774,10 @@ + + if (!PyArg_ParseTuple(args, "|i:flush", &length)) + return NULL; ++ if (length <= 0) { ++ PyErr_SetString(PyExc_ValueError, "length must be greater than zero"); ++ return NULL; ++ } + if (!(retval = PyString_FromStringAndSize(NULL, length))) + return NULL; + |
