RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-14 19:11:53 +00:00
Code Issues Releases Wiki Activity

Change real_setup_and_get_header to use goto a single exit path to simplify

Browse Source 
proper freeing of allocated data.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29619 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2009-09-02 10:10:42 +00:00
parent 144b7f5989
commit 24e788fc4c
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
stream/realrtsp/real.c
View File

@ -427,11 +427,11 @@ rmff_header_t *real_setup_and_get_header(rtsp_t *rtsp_session, uint32_t bandwidt
char *description=NULL; char *description=NULL;
char *session_id=NULL; char *session_id=NULL;
rmff_header_t *h; rmff_header_t *h = NULL;
char *challenge1; char *challenge1;
char challenge2[41]; char challenge2[41];
char checksum[9]; char checksum[9];
char *subscribe; char *subscribe = NULL;
char *buf = xbuffer_init(256); char *buf = xbuffer_init(256);
char *mrl=rtsp_get_mrl(rtsp_session); char *mrl=rtsp_get_mrl(rtsp_session);
unsigned int size; unsigned int size;
@ -513,8 +513,7 @@ autherr:
alert); alert);
} }
rtsp_send_ok(rtsp_session); rtsp_send_ok(rtsp_session);
buf = xbuffer_free(buf); goto out;
return NULL;
} }
/* receive description */ /* receive description */
@ -528,8 +527,7 @@ autherr:
if (size > MAX_DESC_BUF) { if (size > MAX_DESC_BUF) {
mp_msg(MSGT_STREAM, MSGL_ERR, "realrtsp: Content-length for description too big (> %uMB)!\n", mp_msg(MSGT_STREAM, MSGL_ERR, "realrtsp: Content-length for description too big (> %uMB)!\n",
MAX_DESC_BUF/(1024*1024) ); MAX_DESC_BUF/(1024*1024) );
xbuffer_free(buf); goto out;
return NULL;
} }
if (!rtsp_search_answers(rtsp_session,"ETag")) if (!rtsp_search_answers(rtsp_session,"ETag"))
@ -544,8 +542,7 @@ autherr:
description=malloc(size+1); description=malloc(size+1);
if( rtsp_read_data(rtsp_session, description, size) <= 0) { if( rtsp_read_data(rtsp_session, description, size) <= 0) {
buf = xbuffer_free(buf); goto out;
return NULL;
} }
description[size]=0; description[size]=0;
@ -554,9 +551,7 @@ autherr:
strcpy(subscribe, "Subscribe: "); strcpy(subscribe, "Subscribe: ");
h=real_parse_sdp(description, &subscribe, bandwidth); h=real_parse_sdp(description, &subscribe, bandwidth);
if (!h) { if (!h) {
subscribe = xbuffer_free(subscribe); goto out;
buf = xbuffer_free(buf);
return NULL;
} }
rmff_fix_header(h); rmff_fix_header(h);
@ -619,6 +614,7 @@ autherr:
/* and finally send a play request */ /* and finally send a play request */
rtsp_request_play(rtsp_session,NULL); rtsp_request_play(rtsp_session,NULL);
out:
subscribe = xbuffer_free(subscribe); subscribe = xbuffer_free(subscribe);
buf = xbuffer_free(buf); buf = xbuffer_free(buf);
return h; return h;