msado15: Fix NULL pointer dereference in close_recordset.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49281Signed-off-by: Hans Leidekker <hans@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msado15: Fix NULL pointer dereference in close_recordset.
fb1d46fc · Hans Leidekker · Alexandre Julliard · c2a4a4ec · fb1d46fc
Commit fb1d46fc authored May 29, 2020 by Hans Leidekker Committed by Alexandre Julliard May 29, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

recordset.c dlls/msado15/recordset.c +4 -1

No files found.
--- 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 );