Changeset 3ac440cc8d9a6cc9cfe7443d5e2639ef0a3fa154

Timestamp:

03/10/07 17:35:27 (1 year ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1173544527 +0000

git-parent:

[0bad98632b141f0376b83314f1ea61ab1a27788b]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1173544527 +0000

Message:

Fix a bunch of potential memleaks.

Files:

• src/extras/libc.c (modified) (12 diffs)

src/extras/libc.c

@@ -99 +99 @@
-    len = __MIN( len, n );
-    psz = (char*)malloc( len + 1 );
-
-    if( psz != NULL )
-    {
@@ -257 +256 @@
-{
-    double f_result;
-
+ = NULL
-    int i_len = strlen( nptr ) + 1;
-
-    psz_tmp = malloc( i_len * sizeof(wchar_t) );
+    if( !psz_tmp )
+        return NULL;
-    MultiByteToWideChar( CP_ACP, 0, nptr, -1, psz_tmp, i_len );
-    f_result = wcstod( psz_tmp, NULL );
@@ -412 +413 @@
-void *vlc_wopendir( const wchar_t *wpath )
-{
-
-
+ = NULL
+ = NULL
-
-    if ( wpath == NULL || wpath[0] == '\0'
@@ -420 +421 @@
-        /* Special mode to list drive letters */
-        p_dir = malloc( sizeof(vlc_DIR) );
+        if( !p_dir )
+            return NULL;
-        p_dir->p_real_dir = NULL;
-        p_dir->i_drives = GetLogicalDrives();
@@ -430 +433 @@
-
-    p_dir = malloc( sizeof(vlc_DIR) );
+    if( !p_dir )
+    {
+        _wclosedir( p_real_dir );
+        return NULL;
+    }
-    p_dir->p_real_dir = p_real_dir;
-
@@ -552 +560 @@
-        size = sizeof( struct dirent ) + strlen( p_content->d_name ) + 1;
-        pp_list[ret] = malloc( size );
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -938 +957 @@
-
-    *pi_data = 0;
+    if( *pp_data )
+        free( *pp_data );
+    *pp_data = NULL;
-    *pp_data = malloc( 1025 );  /* +1 for \0 */
+    if( !*pp_data )
+        return -1;
-
-    while ( !p_object->b_die )
@@ -1022 +1046 @@
-    HANDLE hChildStdinRd, hChildStdinWr, hChildStdoutRd, hChildStdoutWr;
-    DWORD i_status;
-, *p_env, *p
+ = NULL, *p_env = NULL, *p = NULL
-    char **ppsz_parser;
-    int i_size;
@@ -1065 +1089 @@
-    /* Set up the command line. */
-    psz_cmd = malloc(32768);
+    if( !psz_cmd )
+        return -1;
-    psz_cmd[0] = '\0';
-    i_size = 32768;
@@ -1092 +1118 @@
-    /* Set up the environment. */
-    p = p_env = malloc(32768);
+    if( !p )
+    {
+        free( psz_cmd );
+        return -1;
+    }
+
-    i_size = 32768;
-    ppsz_parser = &ppsz_env[0];
@@ -1144 +1176 @@
-    /* Read output from the child process. */
-    *pi_data = 0;
+    if( *pp_data )
+        free( pp_data );
+    *pp_data = NULL;
-    *pp_data = malloc( 1025 );  /* +1 for \0 */
-
@@ -1177 +1212 @@
-
-    (*pp_data)[*pi_data] = '\0';
-
-    return 0;
-}