RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

memleak fixes when invalid http url specified. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16418 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2005-09-06 21:00:57 +00:00
parent e72392399b
commit e036d0cf35
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmpdemux/http.c
View File

@ -875,7 +875,7 @@ static int open_s1(stream_t *stream,int mode, void* opts, int* file_format) {
stream->streaming_ctrl->bandwidth = network_bandwidth;
url = url_new(stream->url);
stream->streaming_ctrl->url = check4proxies(url);
//url_free(url);
url_free(url);
mp_msg(MSGT_OPEN, MSGL_INFO, "STREAM_HTTP(1), URL: %s\n", stream->url);
seekable = http_streaming_start(stream, file_format);

9
libmpdemux/network.c
View File

@ -417,7 +417,7 @@ http_send_request( URL_t *url, off_t pos ) {
http_set_field( http_hdr, "Connection: close");
http_add_basic_authentication( http_hdr, url->username, url->password );
if( http_build_request( http_hdr )==NULL ) {
return -1;
goto err_out;
}
if( proxy ) {
@ -429,19 +429,22 @@ http_send_request( URL_t *url, off_t pos ) {
fd = connect2Server( server_url->hostname, server_url->port,1 );
}
if( fd<0 ) {
return -1;
goto err_out;
}
mp_msg(MSGT_NETWORK,MSGL_DBG2,"Request: [%s]\n", http_hdr->buffer );
ret = send( fd, http_hdr->buffer, http_hdr->buffer_size, 0 );
if( ret!=(int)http_hdr->buffer_size ) {
mp_msg(MSGT_NETWORK,MSGL_ERR,"Error while sending HTTP request: didn't sent all the request\n");
return -1;
goto err_out;
}
http_free( http_hdr );
return fd;
err_out:
http_free(http_hdr);
return -1;
}
HTTP_header_t *