MP4: use strcpsn() and check one malloc()

346ae7a9 · Rémi Denis-Courmont · 11cd9e3c · 346ae7a9
Commit 346ae7a9 authored Oct 04, 2011 by Rémi Denis-Courmont
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 7 deletions

modules/demux/mp4/libmp4.c modules/demux/mp4/libmp4.c +2 -7

No files found.
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -3203,17 +3203,12 @@ static void get_token( char **ppsz_path, char **ppsz_token, int *pi_number )
        *pi_number = 0;
        return;
    }
-    i_len = 0;
+    i_len = strcspn( *ppsz_path, "/[" );
-    while(  (*ppsz_path)[i_len] &&
-            (*ppsz_path)[i_len] != '/' && (*ppsz_path)[i_len] != '[' )
-    {
-        i_len++;
-    }
    if( !i_len && **ppsz_path == '/' )
    {
        i_len = 1;
    }
-    *ppsz_token = malloc( i_len + 1 );
+    *ppsz_token = xmalloc( i_len + 1 );
    memcpy( *ppsz_token, *ppsz_path, i_len );