Alistair Leslie-Hughes : msado15: Return early if Execute doesn't return a rowset.

Alexandre Julliard julliard at winehq.org
Thu Jan 20 15:44:48 CST 2022


Module: wine
Branch: master
Commit: 6a9eaa619c683441054f994bf17c8b6d9ab0c228
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=6a9eaa619c683441054f994bf17c8b6d9ab0c228

Author: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date:   Thu Jan 20 13:08:28 2022 +1100

msado15: Return early if Execute doesn't return a rowset.

Not all queries return a rowset, eg delete from ....

In these cases, there isn't anything else to be done.

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

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

diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c
index 92a0deb6959..23865b37688 100644
--- a/dlls/msado15/recordset.c
+++ b/dlls/msado15/recordset.c
@@ -1531,7 +1531,7 @@ static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT
 
     hr = ICommandText_Execute(command_text, NULL, &IID_IUnknown, NULL, &affected, &rowset);
     ICommandText_Release(command_text);
-    if (FAILED(hr))
+    if (FAILED(hr) || !rowset)
         return hr;
 
     ADORecordsetConstruction_put_Rowset(&recordset->ADORecordsetConstruction_iface, rowset);




More information about the wine-cvs mailing list