- DosSetExtLIBPATH objects to a NULL pointer, but a pointer to a NULL

  string does what is expected (ie unset [BEGIN|END]LIBPATH)

- set the size of the DosQuerySysInfo buffer correctly; it was safe,
  but incorrect (allowing a 1 element overrun)

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index d34756a169b28973d7bb11a26370c4316c16b78b..879d57e8eeeb1d9dd3e1ae8cbb045ea0d85cf677 100644 (file)
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -5410,9 +5410,6 @@ posix_putenv(PyObject *self, PyObject *args)
     if (stricmp(s1, "BEGINLIBPATH") == 0) {
         APIRET rc;
 
-        if (strlen(s2) == 0)  /* If New Value is an Empty String */
-            s2 = NULL;        /* Then OS/2 API Wants a NULL to Undefine It */
-
         rc = DosSetExtLIBPATH(s2, BEGIN_LIBPATH);
         if (rc != NO_ERROR)
             return os2_error(rc);
@@ -5420,9 +5417,6 @@ posix_putenv(PyObject *self, PyObject *args)
     } else if (stricmp(s1, "ENDLIBPATH") == 0) {
         APIRET rc;
 
-        if (strlen(s2) == 0)  /* If New Value is an Empty String */
-            s2 = NULL;        /* Then OS/2 API Wants a NULL to Undefine It */
-
         rc = DosSetExtLIBPATH(s2, END_LIBPATH);
         if (rc != NO_ERROR)
             return os2_error(rc);
@@ -7265,7 +7259,7 @@ static int insertvalues(PyObject *module)
     char     *ver, tmp[50];
 
     Py_BEGIN_ALLOW_THREADS
-    rc = DosQuerySysInfo(1, QSV_MAX, &values[1], sizeof(values));
+    rc = DosQuerySysInfo(1L, QSV_MAX, &values[1], sizeof(ULONG) * QSV_MAX);
     Py_END_ALLOW_THREADS
 
     if (rc != NO_ERROR) {