oledb32: Properly free property sets and propinfo sets (Coverity)

Nikolay Sivov nsivov at codeweavers.com
Wed Nov 28 23:53:24 CST 2012


Properly free property sets and propinfo sets (Coverity)
-------------- next part --------------
>From 4ff8ac300428f80838cedd7a46b13289c0eef1aa Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov at codeweavers.com>
Date: Thu, 29 Nov 2012 08:22:55 -0500
Subject: [PATCH 6/6] Properly free property sets and propinfo sets (Coverity)

---
 dlls/oledb32/datainit.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c
index b53e08a..a191c88 100644
--- a/dlls/oledb32/datainit.c
+++ b/dlls/oledb32/datainit.c
@@ -355,8 +355,8 @@ static void free_dbpropset(ULONG count, DBPROPSET *propset)
             VariantClear(&propset[i].rgProperties[p].vValue);
             CoTaskMemFree(&propset[i].rgProperties[p]);
         }
-        CoTaskMemFree(&propset[i]);
     }
+    CoTaskMemFree(propset);
 }
 
 static void free_dbpropinfoset(ULONG count, DBPROPINFOSET *propinfoset)
@@ -372,8 +372,8 @@ static void free_dbpropinfoset(ULONG count, DBPROPINFOSET *propinfoset)
             VariantClear(&propinfoset[i].rgPropertyInfos[p].vValues);
             CoTaskMemFree(&propinfoset[i].rgPropertyInfos[p]);
         }
-        CoTaskMemFree(&propinfoset[i]);
     }
+    CoTaskMemFree(propinfoset);
 }
 
 static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, IUnknown *datasource,
-- 
1.7.10.4




More information about the wine-patches mailing list