Nikolay Sivov : oledb32: Handle CLSIDFromProgID() failure (Coverity).

Alexandre Julliard julliard at wine.codeweavers.com
Thu Jun 4 09:32:02 CDT 2015


Module: wine
Branch: master
Commit: 1d08eb284ac3e9863e9fc689db4168030c431a83
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1d08eb284ac3e9863e9fc689db4168030c431a83

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Wed Jun  3 18:32:12 2015 +0300

oledb32: Handle CLSIDFromProgID() failure (Coverity).

---

 dlls/oledb32/datainit.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c
index 3cd3821..3e1f509 100644
--- a/dlls/oledb32/datainit.c
+++ b/dlls/oledb32/datainit.c
@@ -498,10 +498,10 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o
 
         TRACE("initial data source provider %s\n", debugstr_w(V_BSTR(&propset->rgProperties[0].vValue)));
         initprov = IID_NULL;
-        CLSIDFromProgID(V_BSTR(&propset->rgProperties[0].vValue), &initprov);
+        hr = CLSIDFromProgID(V_BSTR(&propset->rgProperties[0].vValue), &initprov);
         free_dbpropset(count, propset);
 
-        if (!IsEqualIID(&provclsid, &initprov)) return DB_E_MISMATCHEDPROVIDER;
+        if (FAILED(hr) || !IsEqualIID(&provclsid, &initprov)) return DB_E_MISMATCHEDPROVIDER;
     }
 
     if (!*datasource)




More information about the wine-cvs mailing list