RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-17 04:40:09 +00:00
Code Issues Releases Wiki Activity

memleak fix, escfilename was not freed for an invalid url

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16422 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2005-09-06 21:45:40 +00:00
parent 956f6bdd47
commit 54aa920577
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libmpdemux/url.c
View File

@ -16,7 +16,7 @@
URL_t* URL_t*
url_new(const char* url) { url_new(const char* url) {
int pos1, pos2,v6addr = 0; int pos1, pos2,v6addr = 0;
URL_t* Curl; URL_t* Curl = NULL;
char *escfilename=NULL; char *escfilename=NULL;
char *unescfilename=NULL; char *unescfilename=NULL;
char *ptr1=NULL, *ptr2=NULL, *ptr3=NULL, *ptr4=NULL; char *ptr1=NULL, *ptr2=NULL, *ptr3=NULL, *ptr4=NULL;
@ -28,22 +28,19 @@ url_new(const char* url) {
unescfilename=malloc(strlen(url)+1); unescfilename=malloc(strlen(url)+1);
if (!unescfilename ) { if (!unescfilename ) {
mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n");
return NULL; goto err_out;
} }
escfilename=malloc(strlen(url)*3+1); escfilename=malloc(strlen(url)*3+1);
if (!escfilename ) { if (!escfilename ) {
free(unescfilename);
mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n");
return NULL; goto err_out;
} }
// Create the URL container // Create the URL container
Curl = (URL_t*)malloc(sizeof(URL_t)); Curl = (URL_t*)malloc(sizeof(URL_t));
if( Curl==NULL ) { if( Curl==NULL ) {
mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n");
if (unescfilename) free(unescfilename); goto err_out;
if (escfilename) free(escfilename);
return NULL;
} }
// Initialisation of the URL container members // Initialisation of the URL container members
@ -54,13 +51,13 @@ url_new(const char* url) {
// violating RFC 2396 // violating RFC 2396
url_escape_string(escfilename,unescfilename); url_escape_string(escfilename,unescfilename);
free(unescfilename); free(unescfilename);
unescfilename = NULL;
// Copy the url in the URL container // Copy the url in the URL container
Curl->url = strdup(escfilename); Curl->url = strdup(escfilename);
if( Curl->url==NULL ) { if( Curl->url==NULL ) {
mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n");
url_free(Curl); goto err_out;
return NULL;
} }
mp_msg(MSGT_OPEN,MSGL_V,"Filename for url is now %s\n",escfilename); mp_msg(MSGT_OPEN,MSGL_V,"Filename for url is now %s\n",escfilename);
@ -73,16 +70,14 @@ url_new(const char* url) {
jumpSize = 1; jumpSize = 1;
} else { } else {
mp_msg(MSGT_NETWORK,MSGL_V,"Not an URL!\n"); mp_msg(MSGT_NETWORK,MSGL_V,"Not an URL!\n");
url_free(Curl); goto err_out;
return NULL;
} }
} }
pos1 = ptr1-escfilename; pos1 = ptr1-escfilename;
Curl->protocol = (char*)malloc(pos1+1); Curl->protocol = (char*)malloc(pos1+1);
if( Curl->protocol==NULL ) { if( Curl->protocol==NULL ) {
mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n");
url_free(Curl); goto err_out;
return NULL;
} }
strncpy(Curl->protocol, escfilename, pos1); strncpy(Curl->protocol, escfilename, pos1);
Curl->protocol[pos1] = '\0'; Curl->protocol[pos1] = '\0';
@ -104,8 +99,7 @@ url_new(const char* url) {
Curl->username = (char*)malloc(len+1); Curl->username = (char*)malloc(len+1);
if( Curl->username==NULL ) { if( Curl->username==NULL ) {
mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n");
url_free(Curl); goto err_out;
return NULL;
} }
strncpy(Curl->username, ptr1, len); strncpy(Curl->username, ptr1, len);
Curl->username[len] = '\0'; Curl->username[len] = '\0';
@ -118,8 +112,7 @@ url_new(const char* url) {
Curl->password = (char*)malloc(len2+1); Curl->password = (char*)malloc(len2+1);
if( Curl->password==NULL ) { if( Curl->password==NULL ) {
mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n");
url_free(Curl); goto err_out;
return NULL;
} }
strncpy( Curl->password, ptr3+1, len2); strncpy( Curl->password, ptr3+1, len2);
Curl->password[len2]='\0'; Curl->password[len2]='\0';
@ -171,8 +164,7 @@ url_new(const char* url) {
Curl->hostname = (char*)malloc(pos2-pos1+1); Curl->hostname = (char*)malloc(pos2-pos1+1);
if( Curl->hostname==NULL ) { if( Curl->hostname==NULL ) {
mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n");
url_free(Curl); goto err_out;
return NULL;
} }
strncpy(Curl->hostname, ptr1, pos2-pos1); strncpy(Curl->hostname, ptr1, pos2-pos1);
Curl->hostname[pos2-pos1] = '\0'; Curl->hostname[pos2-pos1] = '\0';
@ -187,8 +179,7 @@ url_new(const char* url) {
Curl->file = strdup(ptr2); Curl->file = strdup(ptr2);
if( Curl->file==NULL ) { if( Curl->file==NULL ) {
mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n");
url_free(Curl); goto err_out;
return NULL;
} }
} }
} }
@ -197,14 +188,18 @@ url_new(const char* url) {
Curl->file = (char*)malloc(2); Curl->file = (char*)malloc(2);
if( Curl->file==NULL ) { if( Curl->file==NULL ) {
mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n");
url_free(Curl); goto err_out;
return NULL;
} }
strcpy(Curl->file, "/"); strcpy(Curl->file, "/");
} }
free(escfilename); free(escfilename);
return Curl; return Curl;
err_out:
if (escfilename) free(escfilename);
if (unescfilename) free(unescfilename);
if (Curl) url_free(Curl);
return NULL;
} }
void void