From 549e55a3086d04c13da9b6f33214f6399681292a Mon Sep 17 00:00:00 2001
From: Zackery Spytz <zspytz@gmail.com>
Date: Fri, 31 May 2019 18:16:20 -0600
Subject: [PATCH] bpo-12202: Properly check MsiSummaryInfoGetProperty() calls
 in msilib (GH-13711)

---
 Lib/test/test_msilib.py                                  | 9 +++++++++
 .../Library/2019-05-31-15-53-34.bpo-12202.nobzc9.rst     | 2 ++
 PC/_msi.c                                                | 3 +++
 3 files changed, 14 insertions(+)
 create mode 100644 Misc/NEWS.d/next/Library/2019-05-31-15-53-34.bpo-12202.nobzc9.rst

diff --git a/Lib/test/test_msilib.py b/Lib/test/test_msilib.py
index 265eaea59b5..fa0be581613 100644
--- a/Lib/test/test_msilib.py
+++ b/Lib/test/test_msilib.py
@@ -85,6 +85,7 @@ class MsiDatabaseTestCase(unittest.TestCase):
 
     def test_directory_start_component_keyfile(self):
         db, db_path = init_database()
+        self.addCleanup(unlink, db_path)
         self.addCleanup(db.Close)
         feature = msilib.Feature(db, 0, 'Feature', 'A feature', 'Python')
         cab = msilib.CAB('CAB')
@@ -92,6 +93,14 @@ class MsiDatabaseTestCase(unittest.TestCase):
                                'SourceDir', 0)
         dir.start_component(None, feature, None, 'keyfile')
 
+    def test_getproperty_uninitialized_var(self):
+        db, db_path = init_database()
+        self.addCleanup(unlink, db_path)
+        self.addCleanup(db.Close)
+        si = db.GetSummaryInformation(0)
+        with self.assertRaises(msilib.MSIError):
+            si.GetProperty(-1)
+
 
 class Test_make_id(unittest.TestCase):
     #http://msdn.microsoft.com/en-us/library/aa369212(v=vs.85).aspx
diff --git a/Misc/NEWS.d/next/Library/2019-05-31-15-53-34.bpo-12202.nobzc9.rst b/Misc/NEWS.d/next/Library/2019-05-31-15-53-34.bpo-12202.nobzc9.rst
new file mode 100644
index 00000000000..1e561970445
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-05-31-15-53-34.bpo-12202.nobzc9.rst
@@ -0,0 +1,2 @@
+Fix the error handling in :meth:`msilib.SummaryInformation.GetProperty`. Patch
+by Zackery Spytz.
diff --git a/PC/_msi.c b/PC/_msi.c
index 4c8df5b42b9..accbe7a7206 100644
--- a/PC/_msi.c
+++ b/PC/_msi.c
@@ -571,6 +571,9 @@ summary_getproperty(msiobj* si, PyObject *args)
         status = MsiSummaryInfoGetProperty(si->h, field, &type, &ival,
             &fval, sval, &ssize);
     }
+    if (status != ERROR_SUCCESS) {
+        return msierror(status);
+    }
 
     switch(type) {
         case VT_I2: