Commit 549e55a3 authored by Zackery Spytz's avatar Zackery Spytz Committed by Berker Peksag

bpo-12202: Properly check MsiSummaryInfoGetProperty() calls in msilib (GH-13711)

parent ed9f3562
......@@ -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
......
Fix the error handling in :meth:`msilib.SummaryInformation.GetProperty`. Patch
by Zackery Spytz.
......@@ -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:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment