msxml3: Add error handling when reading from IStream.

126c0abe · Piotr Caban · Alexandre Julliard · 655155fe · 126c0abe
Commit 126c0abe authored Aug 20, 2008 by Piotr Caban Committed by Alexandre Julliard Aug 21, 2008
Show whitespace changes
Inline Side-by-side

Showing with 19 additions and 0 deletions

saxreader.c dlls/msxml3/saxreader.c +19 -0

No files found.
--- a/dlls/msxml3/saxreader.c
+++ b/dlls/msxml3/saxreader.c
@@ -1876,8 +1876,20 @@ static HRESULT WINAPI internal_parse(
                    if(hr == E_PENDING) continue;
                    break;
                }
+                if(hr != S_OK)
+                {
+                    IStream_Release(stream);
+                    break;
+                }
+
                data = HeapAlloc(GetProcessHeap(), 0,
                        dataInfo.cbSize.QuadPart);
+                if(!data)
+                {
+                    IStream_Release(stream);
+                    break;
+                }
+
                while(1)
                {
                    hr = IStream_Read(stream, data,
@@ -1885,6 +1897,13 @@ static HRESULT WINAPI internal_parse(
                    if(hr == E_PENDING) continue;
                    break;
                }
+                if(hr != S_OK)
+                {
+                    HeapFree(GetProcessHeap(), 0, data);
+                    IStream_Release(stream);
+                    break;
+                }
+
                hr = internal_parseBuffer(This, data,
                        dataInfo.cbSize.QuadPart, vbInterface);
                HeapFree(GetProcessHeap(), 0, data);