From 1f48c89e04ed9ce63ddbcd95cf8a6b71233e1923 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Fri, 8 Jun 2012 14:08:28 +0900
Subject: [PATCH] windowscodecs: Protect from invalid input some metadata
 handler methods.

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

diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c
index afcff21afc7..013fe045d09 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));
-- 
2.11.4.GIT