Address issues brought up by MvL on python-checkins.

I tested this with valgrind on amd64.

The man pages I found for diff architectures are inconsistent on this.
I'm not entirely sure this change is correct for all architectures either.

Perhaps we should just over-allocate and not worry about it?

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 4b5842e8629bd3b1457ae5c1f0b8696ab9ddf0e4..b51ba5dc54c56f9d926f0933c6adbdc33372f32b 100644 (file)
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -6809,7 +6809,7 @@ posix_confstr(PyObject *self, PyObject *args)
 {
     PyObject *result = NULL;
     int name;
-    char buffer[64];
+    char buffer[256];
 
     if (PyArg_ParseTuple(args, "O&:confstr", conv_confstr_confname, &name)) {
        int len;
@@ -6827,12 +6827,12 @@ posix_confstr(PyObject *self, PyObject *args)
         }
         else {
            if ((unsigned int)len >= sizeof(buffer)) {
-                result = PyString_FromStringAndSize(NULL, len+1);
+                result = PyString_FromStringAndSize(NULL, len-1);
                 if (result != NULL)
-                    confstr(name, PyString_AS_STRING(result), len+1);
+                    confstr(name, PyString_AS_STRING(result), len);
             }
             else
-                result = PyString_FromString(buffer);
+                result = PyString_FromStringAndSize(buffer, len-1);
         }
     }
     return result;