Marcus Meissner : winhttp: Check return value of CLSIDFromProgID (Coverity) .

Alexandre Julliard julliard at winehq.org
Thu Nov 24 15:04:38 CST 2011


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

Author: Marcus Meissner <meissner at suse.de>
Date:   Thu Nov 24 03:04:27 2011 +0100

winhttp: Check return value of CLSIDFromProgID (Coverity).

---

 dlls/winhttp/session.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c
index f33508e..110de80 100644
--- a/dlls/winhttp/session.c
+++ b/dlls/winhttp/session.c
@@ -423,6 +423,7 @@ BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT
                 session->proxy_server, colon - session->proxy_server - 1 ))
             {
                 heap_free( connect->servername );
+                connect->sockaddr.ss_family = 0xffff;
                 if (!(connect->servername = heap_alloc(
                     (colon - session->proxy_server + 1) * sizeof(WCHAR) )))
                 {
@@ -444,6 +445,7 @@ BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT
                 session->proxy_server ))
             {
                 heap_free( connect->servername );
+                connect->sockaddr.ss_family = 0xffff;
                 if (!(connect->servername = strdupW( session->proxy_server )))
                 {
                     ret = FALSE;
@@ -456,6 +458,7 @@ BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT
     else if (server)
     {
         heap_free( connect->servername );
+        connect->sockaddr.ss_family = 0xffff;
         if (!(connect->servername = strdupW( server )))
         {
             ret = FALSE;
@@ -1837,7 +1840,9 @@ static BOOL run_script( const BSTR script, const WCHAR *url, WINHTTP_PROXY_INFO
     hostname[uc.dwHostNameLength] = 0;
 
     init = CoInitialize( NULL );
-    CLSIDFromProgID( jscriptW, &clsid );
+    hr = CLSIDFromProgID( jscriptW, &clsid );
+    if (hr != S_OK) goto done;
+
     hr = CoCreateInstance( &clsid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER,
                            &IID_IActiveScript, (void **)&engine );
     if (hr != S_OK) goto done;




More information about the wine-cvs mailing list