This repository was archived by the owner on Feb 13, 2025. It is now read-only.

Commit 549e55a

ZackerySpytzberkerpeksag

authored and

committed

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

1 parent ed9f356 commit 549e55aCopy full SHA for 549e55a

File tree

+14

-0

lines changed

+14

-0

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -85,13 +85,22 @@ def test_get_property_vt_empty(self):`
`85`	`85`
`86`	`86`	`def test_directory_start_component_keyfile(self):`
`87`	`87`	`db, db_path = init_database()`
	`88`	`+ self.addCleanup(unlink, db_path)`
`88`	`89`	`self.addCleanup(db.Close)`
`89`	`90`	`feature = msilib.Feature(db, 0, 'Feature', 'A feature', 'Python')`
`90`	`91`	`cab = msilib.CAB('CAB')`
`91`	`92`	`dir = msilib.Directory(db, cab, None, TESTFN, 'TARGETDIR',`
`92`	`93`	`'SourceDir', 0)`
`93`	`94`	`dir.start_component(None, feature, None, 'keyfile')`
`94`	`95`
	`96`	`+ def test_getproperty_uninitialized_var(self):`
	`97`	`+ db, db_path = init_database()`
	`98`	`+ self.addCleanup(unlink, db_path)`
	`99`	`+ self.addCleanup(db.Close)`
	`100`	`+ si = db.GetSummaryInformation(0)`
	`101`	`+ with self.assertRaises(msilib.MSIError):`
	`102`	`+ si.GetProperty(-1)`
	`103`	`+`
`95`	`104`
`96`	`105`	`class Test_make_id(unittest.TestCase):`
`97`	`106`	`#http://msdn.microsoft.com/en-us/library/aa369212(v=vs.85).aspx`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix the error handling in :meth:`msilib.SummaryInformation.GetProperty`. Patch
	`2`	`+by Zackery Spytz.`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -571,6 +571,9 @@ summary_getproperty(msiobj* si, PyObject *args)`
`571`	`571`	`status = MsiSummaryInfoGetProperty(si->h, field, &type, &ival,`
`572`	`572`	`&fval, sval, &ssize);`
`573`	`573`	`}`
	`574`	`+ if (status != ERROR_SUCCESS) {`
	`575`	`+ return msierror(status);`
	`576`	`+ }`
`574`	`577`
`575`	`578`	`switch(type) {`
`576`	`579`	`case VT_I2:`

Comments

(0)