X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fsmb.c;h=b5f518b366e5b47349d03486e3839da99cff3e8b;hb=d5845675317c95d4bbd67445d26bc946ab68c075;hp=9f95a9150afaa95fdccac6d446b9cd2278848241;hpb=ba06700b854653f4c1af9175aefcb92796d8fd2e;p=vlc

diff --git a/modules/access/smb.c b/modules/access/smb.c
index 9f95a9150a..b5f518b366 100644
--- a/modules/access/smb.c
+++ b/modules/access/smb.c
@@ -198,25 +198,27 @@ static int Open( vlc_object_t *p_this )
 #ifdef WIN32
     if( psz_user )
         Win32AddConnection( p_access, psz_path, psz_user, psz_pwd, psz_domain);
-    asprintf( &psz_uri, "//%s", psz_path );
+    i_ret = asprintf( &psz_uri, "//%s", psz_path );
 #else
     if( psz_user )
-        asprintf( &psz_uri, "smb://%s%s%s%s%s@%s",
-                  psz_domain ? psz_domain : "", psz_domain ? ";" : "",
-                  psz_user, psz_pwd ? ":" : "",
-                  psz_pwd ? psz_pwd : "", psz_path );
+        i_ret = asprintf( &psz_uri, "smb://%s%s%s%s%s@%s",
+                          psz_domain ? psz_domain : "", psz_domain ? ";" : "",
+                          psz_user, psz_pwd ? ":" : "",
+                          psz_pwd ? psz_pwd : "", psz_path );
     else
-        asprintf( &psz_uri, "smb://%s", psz_path );
+        i_ret = asprintf( &psz_uri, "smb://%s", psz_path );
 #endif
 
     free( psz_user );
     free( psz_pwd );
     free( psz_domain );
 
+    if( i_ret == -1 )
+        return VLC_ENOMEM;
+
 #ifdef USE_CTX
     if( !(p_smb = smbc_new_context()) )
     {
-        msg_Err( p_access, "out of memory" );
         free( psz_uri );
         return VLC_ENOMEM;
     }
@@ -444,7 +446,7 @@ static void Win32AddConnection( access_t *p_access, char *psz_path,
     char psz_remote[MAX_PATH], psz_server[MAX_PATH], psz_share[MAX_PATH];
     NETRESOURCE net_resource;
     DWORD i_result;
-    char *ps_parser;
+    char *psz_parser;
     VLC_UNUSED( psz_domain );
 
     HINSTANCE hdll = LoadLibrary(_T("MPR.DLL"));