Merged revisions 66006 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

TESTED=./python -E -tt ./Lib/test/regrtest.py -uall (both debug and opt modes)

........
  r66006 | neal.norwitz | 2008-08-23 22:04:52 -0700 (Sat, 23 Aug 2008) | 25 lines

  Fix:
   * crashes on memory allocation failure found with failmalloc
   * memory leaks found with valgrind
   * compiler warnings in opt mode which would lead to invalid memory reads
   * problem using wrong name in decimal module reported by pychecker

  Update the valgrind suppressions file with new leaks that are small/one-time
  leaks we don't care about (ie, they are too hard to fix).

  TBR=barry
  TESTED=./python -E -tt ./Lib/test/regrtest.py -uall (both debug and opt modes)
    in opt mode:
    valgrind -q --leak-check=yes --suppressions=Misc/valgrind-python.supp \
      ./python -E -tt ./Lib/test/regrtest.py -uall,-bsddb,-compiler \
                          -x test_logging test_ssl test_multiprocessing
    valgrind -q --leak-check=yes --suppressions=Misc/valgrind-python.supp \
      ./python -E -tt ./Lib/test/regrtest.py test_multiprocessing
    for i in `seq 1 4000` ; do
      LD_PRELOAD=~/local/lib/libfailmalloc.so FAILMALLOC_INTERVAL=$i \
          ./python -c pass
    done

  At least some of these fixes should probably be backported to 2.5.
........

diff --git a/Lib/decimal.py b/Lib/decimal.py
index 88cc5cd5ccda6baf0aca28b5f716dd01c7c8149d..7fb9c7b82e82486b9cd52ee2bc3be02cd1982774 100644 (file)
--- a/Lib/decimal.py
+++ b/Lib/decimal.py
@@ -5147,7 +5147,7 @@ def _dlog10(c, e, p):
         log_tenpower = f*M # exact
     else:
         log_d = 0  # error < 2.31
-        log_tenpower = div_nearest(f, 10**-p) # error < 0.5
+        log_tenpower = _div_nearest(f, 10**-p) # error < 0.5
 
     return _div_nearest(log_tenpower+log_d, 100)
 

diff --git a/Misc/NEWS b/Misc/NEWS
index ae40187951db72d11c92350aa15770ce45515547..314ce5015dcc29da228148fd4bd1372308313ce0 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,14 @@ What's New in Python 3.0 release candidate 1
 Core and Builtins
 -----------------
 
+- Fix crashes on memory allocation failure found with failmalloc.
+
+- Fix memory leaks found with valgrind and update suppressions file.
+
+- Fix compiler warnings in opt mode which would lead to invalid memory reads.
+
+- Fix problem using wrong name in decimal module reported by pychecker.
+
 - Issue #3650: Fixed a reference leak in bytes.split('x').
 
 Library

diff --git a/Misc/valgrind-python.supp b/Misc/valgrind-python.supp
index 7fb8dc7d59cf8afc02a8d72a8955a9a09d5256a1..319e5d1957a22d24e6ed935dfbc2371ba6be6bbd 100644 (file)
--- a/Misc/valgrind-python.supp
+++ b/Misc/valgrind-python.supp
@@ -46,6 +46,39 @@
 #    Will need to fix that.
 #
 
+{
+   Suppress leaking the GIL.  Happens once per process, see comment in ceval.c.
+   Memcheck:Leak
+   fun:malloc
+   fun:PyThread_allocate_lock
+   fun:PyEval_InitThreads
+}
+
+{
+   Suppress leaking the GIL after a fork.
+   Memcheck:Leak
+   fun:malloc
+   fun:PyThread_allocate_lock
+   fun:PyEval_ReInitThreads
+}
+
+{
+   Suppress leaking the autoTLSkey.  This looks like it shouldn't leak though.
+   Memcheck:Leak
+   fun:malloc
+   fun:PyThread_create_key
+   fun:_PyGILState_Init
+   fun:Py_InitializeEx
+   fun:Py_Main
+}
+
+{
+   Hmmm, is this a real leak or like the GIL?
+   Memcheck:Leak
+   fun:malloc
+   fun:PyThread_ReInitTLS
+}
+
 {
    Handle PyMalloc confusing valgrind (possibly leaked)
    Memcheck:Leak

diff --git a/Modules/_ctypes/stgdict.c b/Modules/_ctypes/stgdict.c
index aac073f9a1a5278c1d83f0566c2dac32feaf1295..7db3e0faa20db72753c4b72043ad3f084e3e4d10 100644 (file)
--- a/Modules/_ctypes/stgdict.c
+++ b/Modules/_ctypes/stgdict.c
@@ -408,6 +408,7 @@ StructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct)
                ffi_ofs = 0;
        }
 
+       assert(stgdict->format == NULL);
        if (isStruct && !isPacked) {
                stgdict->format = alloc_format_string(NULL, "T{");
        } else {
@@ -527,7 +528,9 @@ StructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct)
 #undef realdict
 
        if (isStruct && !isPacked) {
+               char *ptr = stgdict->format;
                stgdict->format = alloc_format_string(stgdict->format, "}");
+               PyMem_Free(ptr);
                if (stgdict->format == NULL)
                        return -1;
        }

diff --git a/Modules/_fileio.c b/Modules/_fileio.c
index f0c8fedc3324839341bab276613c7c288cdd4089..ec123e891e83ebf26df0f9ca98108b6f4927c02d 100644 (file)
--- a/Modules/_fileio.c
+++ b/Modules/_fileio.c
@@ -278,6 +278,7 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds)
        ret = -1;
 
  done:
+       PyMem_Free(name);
        return ret;
 }
 

diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
index e1904296aa7c1dc01b04108fae725ae44fffb4e9..8860b3951e401a4cdf6773392c81a87a2c1f03a2 100644 (file)
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -796,7 +796,8 @@ PyInit_signal(void)
 #if defined (HAVE_SETITIMER) || defined (HAVE_GETITIMER)
     ItimerError = PyErr_NewException("signal.ItimerError", 
          PyExc_IOError, NULL);
-    PyDict_SetItemString(d, "ItimerError", ItimerError);
+    if (ItimerError != NULL)
+       PyDict_SetItemString(d, "ItimerError", ItimerError);
 #endif
 
     if (PyErr_Occurred()) {

diff --git a/Objects/stringlib/formatter.h b/Objects/stringlib/formatter.h
index b96443574594c2ec965f46b89caee4eb8b0ebcea..aa99123032a404d93a3632118d376c4e66e2857e 100644 (file)
--- a/Objects/stringlib/formatter.h
+++ b/Objects/stringlib/formatter.h
@@ -641,7 +641,10 @@ format_int_or_long_internal(PyObject *value, const InternalFormatSpec *format,
            /* We know this can't fail, since we've already
               reserved enough space. */
            STRINGLIB_CHAR *pstart = p + n_leading_chars;
-           int r = STRINGLIB_GROUPING(pstart, n_digits, n_digits,
+#ifndef NDEBUG
+           int r =
+#endif
+               STRINGLIB_GROUPING(pstart, n_digits, n_digits,
                           spec.n_total+n_grouping_chars-n_leading_chars,
                           NULL, 0);
            assert(r);

diff --git a/Objects/structseq.c b/Objects/structseq.c
index 091370c9ad5f455d2569179b1c7e56f55969c275..808f9383c2c5ad866b29a3cf4e979d196e08a202 100644 (file)
--- a/Objects/structseq.c
+++ b/Objects/structseq.c
@@ -32,6 +32,8 @@ PyStructSequence_New(PyTypeObject *type)
        PyStructSequence *obj;
 
        obj = PyObject_New(PyStructSequence, type);
+       if (obj == NULL)
+               return NULL;
        Py_SIZE(obj) = VISIBLE_SIZE_TP(type);
 
        return (PyObject*) obj;
@@ -522,10 +524,16 @@ PyStructSequence_InitType(PyTypeObject *type, PyStructSequence_Desc *desc)
        Py_INCREF(type);
 
        dict = type->tp_dict;
-       PyDict_SetItemString(dict, visible_length_key, 
-                      PyLong_FromLong((long) desc->n_in_sequence));
-       PyDict_SetItemString(dict, real_length_key, 
-                      PyLong_FromLong((long) n_members));
-       PyDict_SetItemString(dict, unnamed_fields_key, 
-                      PyLong_FromLong((long) n_unnamed_members));
+#define SET_DICT_FROM_INT(key, value)                          \
+       do {                                                    \
+               PyObject *v = PyLong_FromLong((long) value);    \
+               if (v != NULL) {                                \
+                       PyDict_SetItemString(dict, key, v);     \
+                       Py_DECREF(v);                           \
+               }                                               \
+       } while (0)
+
+       SET_DICT_FROM_INT(visible_length_key, desc->n_in_sequence);
+       SET_DICT_FROM_INT(real_length_key, n_members);
+       SET_DICT_FROM_INT(unnamed_fields_key, n_unnamed_members);
 }

diff --git a/Python/getargs.c b/Python/getargs.c
index cf4444c36e70a198311ff1d2eb9b62b0712ac3a5..b7beb37c907340c3b6f44f8bc150d01f681719c3 100644 (file)
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1354,7 +1354,7 @@ convertbuffer(PyObject *arg, void **p, char **errmsg)
 /* XXX for 3.x, getbuffer and convertbuffer can probably
    be merged again. */
 static int
-getbuffer(PyObject *arg, Py_buffer *view, char**errmsg)
+getbuffer(PyObject *arg, Py_buffer *view, char **errmsg)
 {
        void *buf;
        Py_ssize_t count;
@@ -1364,8 +1364,10 @@ getbuffer(PyObject *arg, Py_buffer *view, char**errmsg)
                return -1;
        }
        if (pb->bf_getbuffer) {
-               if (pb->bf_getbuffer(arg, view, 0) < 0)
+               if (pb->bf_getbuffer(arg, view, 0) < 0) {
+                       *errmsg = "convertible to a buffer";
                        return -1;
+               }
                if (!PyBuffer_IsContiguous(view, 'C')) {
                        *errmsg = "contiguous buffer";
                        return -1;
@@ -1374,8 +1376,10 @@ getbuffer(PyObject *arg, Py_buffer *view, char**errmsg)
        }
 
        count = convertbuffer(arg, &buf, errmsg);
-       if (count < 0)
+       if (count < 0) {
+               *errmsg = "convertible to a buffer";
                return count;
+       }
        PyBuffer_FillInfo(view, NULL, buf, count, 1, 0);
        return 0;
 }