Dmitry Timoshkov : windowscodecs: Protect from invalid input some metadata handler methods.

Alexandre Julliard julliard at winehq.org
Fri Jun 8 13:36:14 CDT 2012


Module: wine
Branch: master
Commit: 1f48c89e04ed9ce63ddbcd95cf8a6b71233e1923
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1f48c89e04ed9ce63ddbcd95cf8a6b71233e1923

Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date:   Fri Jun  8 14:08:28 2012 +0900

windowscodecs: Protect from invalid input some metadata handler methods.

---

 dlls/windowscodecs/metadatahandler.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c
index afcff21..013fe04 100644
--- a/dlls/windowscodecs/metadatahandler.c
+++ b/dlls/windowscodecs/metadatahandler.c
@@ -133,6 +133,8 @@ static ULONG WINAPI MetadataHandler_Release(IWICMetadataWriter *iface)
 static HRESULT WINAPI MetadataHandler_GetMetadataFormat(IWICMetadataWriter *iface,
     GUID *pguidMetadataFormat)
 {
+    if (!pguidMetadataFormat) return E_INVALIDARG;
+
     FIXME("(%p,%s): stub\n", iface, debugstr_guid(pguidMetadataFormat));
     return E_NOTIMPL;
 }
@@ -147,6 +149,8 @@ static HRESULT WINAPI MetadataHandler_GetMetadataHandlerInfo(IWICMetadataWriter
 static HRESULT WINAPI MetadataHandler_GetCount(IWICMetadataWriter *iface,
     UINT *pcCount)
 {
+    if (!pcCount) return E_INVALIDARG;
+
     FIXME("(%p,%p): stub\n", iface, pcCount);
     return E_NOTIMPL;
 }
@@ -514,6 +518,8 @@ static HRESULT MetadataHandlerEnum_Create(MetadataHandler *parent, DWORD index,
 {
     MetadataHandlerEnum *This;
 
+    if (!ppIEnumMetadataItem) return E_INVALIDARG;
+
     *ppIEnumMetadataItem = NULL;
 
     This = HeapAlloc(GetProcessHeap(), 0, sizeof(MetadataHandlerEnum));




More information about the wine-cvs mailing list