Nikolay Sivov : oledb32: Fix DBPROPSET and DBPROPINFOSET cleanup.

Alexandre Julliard julliard at winehq.org
Mon Dec 10 14:00:38 CST 2012


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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Sat Dec  8 13:57:03 2012 +0400

oledb32: Fix DBPROPSET and DBPROPINFOSET cleanup.

---

 dlls/oledb32/datainit.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c
index a191c88..78a005d 100644
--- a/dlls/oledb32/datainit.c
+++ b/dlls/oledb32/datainit.c
@@ -351,10 +351,9 @@ static void free_dbpropset(ULONG count, DBPROPSET *propset)
         int p;
 
         for (p = 0; p < propset[i].cProperties; p++)
-        {
             VariantClear(&propset[i].rgProperties[p].vValue);
-            CoTaskMemFree(&propset[i].rgProperties[p]);
-        }
+
+        CoTaskMemFree(propset[i].rgProperties);
     }
     CoTaskMemFree(propset);
 }
@@ -368,10 +367,9 @@ static void free_dbpropinfoset(ULONG count, DBPROPINFOSET *propinfoset)
         int p;
 
         for (p = 0; p < propinfoset[i].cPropertyInfos; p++)
-        {
             VariantClear(&propinfoset[i].rgPropertyInfos[p].vValues);
-            CoTaskMemFree(&propinfoset[i].rgPropertyInfos[p]);
-        }
+
+        CoTaskMemFree(propinfoset[i].rgPropertyInfos);
     }
     CoTaskMemFree(propinfoset);
 }




More information about the wine-cvs mailing list