changeset:   103439:fa89e107f43d
branch:      3.5
parent:      103435:99db6a25444b
user:        Steve Dower <steve.dower@microsoft.com>
date:        Fri Sep 09 11:56:34 2016 -0700
files:       Misc/NEWS PC/_msi.c
description:
Issue #24594: Validates persist parameter when opening MSI database


diff -r 99db6a25444b -r fa89e107f43d Misc/NEWS
--- a/Misc/NEWS	Fri Sep 09 15:00:09 2016 -0400
+++ b/Misc/NEWS	Fri Sep 09 11:56:34 2016 -0700
@@ -62,6 +62,8 @@
 Library
 -------
 
+- Issue #24594: Validates persist parameter when opening MSI database
+
 - Issue #28047: Fixed calculation of line length used for the base64 CTE
   in the new email policies.
 
diff -r 99db6a25444b -r fa89e107f43d PC/_msi.c
--- a/PC/_msi.c	Fri Sep 09 15:00:09 2016 -0400
+++ b/PC/_msi.c	Fri Sep 09 11:56:34 2016 -0700
@@ -955,6 +955,17 @@
         0,                      /*tp_is_gc*/
 };
 
+#define Py_NOT_PERSIST(x, flag)                        \
+    (x != (int)(flag) &&                      \
+    x != ((int)(flag) | MSIDBOPEN_PATCHFILE))
+
+#define Py_INVALID_PERSIST(x)                \
+    (Py_NOT_PERSIST(x, MSIDBOPEN_READONLY) &&  \
+    Py_NOT_PERSIST(x, MSIDBOPEN_TRANSACT) &&   \
+    Py_NOT_PERSIST(x, MSIDBOPEN_DIRECT) &&     \
+    Py_NOT_PERSIST(x, MSIDBOPEN_CREATE) &&     \
+    Py_NOT_PERSIST(x, MSIDBOPEN_CREATEDIRECT))
+
 static PyObject* msiopendb(PyObject *obj, PyObject *args)
 {
     int status;
@@ -962,11 +973,14 @@
     int persist;
     MSIHANDLE h;
     msiobj *result;
-
     if (!PyArg_ParseTuple(args, "si:MSIOpenDatabase", &path, &persist))
         return NULL;
-
-        status = MsiOpenDatabase(path, (LPCSTR)persist, &h);
+    /* We need to validate that persist is a valid MSIDBOPEN_* value. Otherwise,
+       MsiOpenDatabase may treat the value as a pointer, leading to unexpected
+       behavior. */
+    if (Py_INVALID_PERSIST(persist))
+        return msierror(ERROR_INVALID_PARAMETER);
+    status = MsiOpenDatabase(path, (LPCSTR)persist, &h);
     if (status != ERROR_SUCCESS)
         return msierror(status);