[PATCH] msado15: Fix NULL pointer dereference in close_recordset.

Hans Leidekker hans at codeweavers.com
Fri May 29 04:30:02 CDT 2020


Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49281
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
---
 dlls/msado15/recordset.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c
index 1f16add4c37..ffb37885316 100644
--- a/dlls/msado15/recordset.c
+++ b/dlls/msado15/recordset.c
@@ -748,7 +748,10 @@ static ULONG WINAPI recordset_AddRef( _Recordset *iface )
 
 static void close_recordset( struct recordset *recordset )
 {
-    ULONG row, col, col_count = get_column_count( recordset );
+    ULONG row, col, col_count;
+
+    if (!recordset->fields) return;
+    col_count = get_column_count( recordset );
 
     recordset->fields->recordset = NULL;
     Fields_Release( &recordset->fields->Fields_iface );
-- 
2.20.1




More information about the wine-devel mailing list