commit 953152f0640d7c99b9ffe03392a4c9ce590489cb
author Georg Brandl <georg@python.org> Wed Jul 22 12:03:59 2009 +0000
committer Georg Brandl <georg@python.org> Wed Jul 22 12:03:59 2009 +0000
tree fd4a8d794c249b3a96846d8427e8df0ca4bb0862
parent 2f19bb1447ace998a375c96708a34058c2b4ffff

Merged revisions 74167 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74167 | georg.brandl | 2009-07-22 13:57:15 +0200 (Mi, 22 Jul 2009) | 1 line

  Issue #6540: Fixed crash for bytearray.translate() with invalid parameters.
........

Objects/bytearrayobject.c

diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 165fd10..f3d5697 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -1389,15 +1389,17 @@
         if (vtable.len != 256) {
             PyErr_SetString(PyExc_ValueError,
                             "translation table must be 256 characters long");
-            goto done;
+            PyBuffer_Release(&vtable);
+            return NULL;
         }
         table = (const char*)vtable.buf;
     }
 
     if (delobj != NULL) {
         if (_getbuffer(delobj, &vdel) < 0) {
-            delobj = NULL;  /* don't try to release vdel buffer on exit */
-            goto done;
+            if (tableobj != NULL)
+                PyBuffer_Release(&vtable);
+            return NULL;
         }
     }
     else {