oledb32: Fix DBPROPSET and DBPROPINFOSET cleanup
Nikolay Sivov
nsivov at codeweavers.com
Sun Dec 9 00:31:04 CST 2012
rgProperties is a pointer to DBPROP array, and rgPropertyInfos - a
pointer to DBPROPINFO array.
-------------- next part --------------
>From 4abe6e693d05800fa50b80cb60596c2f814d15ff Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov at codeweavers.com>
Date: Sat, 8 Dec 2012 13:57:03 +0400
Subject: [PATCH 3/8] Fix DBPROPSET and DBPROPINFOSET cleanup
---
dlls/oledb32/datainit.c | 10 ++++------
1 file 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);
}
--
1.7.10.4
More information about the wine-patches
mailing list