github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-10-18 10:25:02 +02:00
Code Releases Activity

free memory on error in http_add_basic_authentication

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18095 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-04-14 13:37:38 +00:00
parent ecc88de7f6
commit 5c51b13785
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libmpdemux/http.c
View File

@ -585,8 +585,9 @@ http_set_uri( HTTP_header_t *http_hdr, const char *uri ) {
int
http_add_basic_authentication( HTTP_header_t *http_hdr, const char *username, const char *password ) {
char *auth, *usr_pass, *b64_usr_pass;
char *auth = NULL, *usr_pass = NULL, *b64_usr_pass = NULL;
int encoded_len, pass_len=0, out_len;
int res = -1;
if( http_hdr==NULL || username==NULL ) return -1;
if( password!=NULL ) {
@ -596,7 +597,7 @@ http_add_basic_authentication( HTTP_header_t *http_hdr, const char *username, co
usr_pass = (char*)malloc(strlen(username)+pass_len+2);
if( usr_pass==NULL ) {
mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n");
return -1;
goto out;
}
sprintf( usr_pass, "%s:%s", username, (password==NULL)?"":password );
@ -606,13 +607,13 @@ http_add_basic_authentication( HTTP_header_t *http_hdr, const char *username, co
b64_usr_pass = (char*)malloc(encoded_len);
if( b64_usr_pass==NULL ) {
mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n");
return -1;
goto out;
}
out_len = base64_encode( usr_pass, strlen(usr_pass), b64_usr_pass, encoded_len);
if( out_len<0 ) {
mp_msg(MSGT_NETWORK,MSGL_FATAL,"Base64 out overflow\n");
return -1;
goto out;
}
b64_usr_pass[out_len]='\0';
@ -620,17 +621,19 @@ http_add_basic_authentication( HTTP_header_t *http_hdr, const char *username, co
auth = (char*)malloc(encoded_len+22);
if( auth==NULL ) {
mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n");
return -1;
goto out;
}
sprintf( auth, "Authorization: Basic %s", b64_usr_pass);
http_set_field( http_hdr, auth );
res = 0;
out:
free( usr_pass );
free( b64_usr_pass );
free( auth );
return 0;
return res;
}
void