[PATCH 0/2] MR2022: oledb32: Heap corruption fixes.

[Rémi Bernon (＠rbernon)]

Spotted with warn+heap.

[PATCH 1/2] oledb32: Fix error info cleanup dispparams rgvarg index.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/oledb32/errorinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c
index b6e0d10e8e0..6857caeb368 100644
--- a/dlls/oledb32/errorinfo.c
+++ b/dlls/oledb32/errorinfo.c
@@ -120,7 +120,7 @@ static ULONG WINAPI errorrecords_Release(IErrorInfo* iface)
                 IUnknown_Release(This->records[i].custom_error);

for (j = 0; j < dispparams->cArgs && dispparams->rgvarg; j++)
-                VariantClear(&dispparams->rgvarg[i]);
+                VariantClear(&dispparams->rgvarg[j]);
             CoTaskMemFree(dispparams->rgvarg);
             CoTaskMemFree(dispparams->rgdispidNamedArgs);
         }

[PATCH 2/2] oledb32/tests: Avoid use-after-free and unused assignment.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/oledb32/tests/database.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c
index 5d99aef7a89..26e3ebf2186 100644
--- a/dlls/oledb32/tests/database.c
+++ b/dlls/oledb32/tests/database.c
@@ -1043,13 +1043,9 @@ static void test_odbc_provider(void)
         ok(propidlist.cPropertyIDs == 14, "got %ld\n", propinfoset->cPropertyInfos);

for (i = 0; i < propidlist.cPropertyIDs; i++)
-        {
             ok(properties[i] == propidlist.rgPropertyIDs[i], "%ld, got %ld\n", i,
                     propidlist.rgPropertyIDs[i]);

-            propidlist.rgPropertyIDs[i] = propinfoset->rgPropertyInfos[i].dwPropertyID;
-        }
-
         CoTaskMemFree(propidlist.rgPropertyIDs);
         CoTaskMemFree(propset);
     }