Fix infinite loop in image parser with zero sized files

chrdavis · chrdavis · commit cf68f216d978 · 2017-06-15T23:41:10.000-07:00
diff --git a/PIFShellExtensionsLib/PIFParser.cpp b/PIFShellExtensionsLib/PIFParser.cpp
@@ -356,7 +356,7 @@ HRESULT CBaseImageParser::ReadLineFromStream(
         while (SUCCEEDED(hr) && IsWhitespace(chCurrent))
         {
             hr = IStream_Read(pStream, (void*)&chCurrent, sizeof(char));
-            if (IsWhitespace(chCurrent))
+            if (SUCCEEDED(hr) && IsWhitespace(chCurrent))
             {
                 // If we found leading white space chars we need to update
                 // our origin.

Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,7 @@ HRESULT CBaseImageParser::ReadLineFromStream(`
`356`	`356`	`while (SUCCEEDED(hr) && IsWhitespace(chCurrent))`
`357`	`357`	`{`
`358`	`358`	`hr = IStream_Read(pStream, (void*)&chCurrent, sizeof(char));`
`359`		`- if (IsWhitespace(chCurrent))`
	`359`	`+ if (SUCCEEDED(hr) && IsWhitespace(chCurrent))`
`360`	`360`	`{`
`361`	`361`	`// If we found leading white space chars we need to update`
`362`	`362`	`// our origin.`