RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 09:12:33 +00:00
Code Issues Projects Releases Wiki Activity

http: restructure http_connect error handling path

Browse Source 
The authstr memory allocations make it annoying to error in the middle
of the header setup code, so apply the usual C error handling idiom to
make it easier to error at any point.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
wm4 2014-03-21 18:51:31 +01:00 committed by Michael Niedermayer
parent 6ee2911996
commit 686e662676
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/http.c
View File

@ -775,17 +775,14 @@ static int http_connect(URLContext *h, const char *path, const char *local_path,
authstr ? authstr : "", authstr ? authstr : "",
proxyauthstr ? "Proxy-" : "", proxyauthstr ? proxyauthstr : ""); proxyauthstr ? "Proxy-" : "", proxyauthstr ? proxyauthstr : "");
av_freep(&authstr);
av_freep(&proxyauthstr);
av_log(h, AV_LOG_DEBUG, "request: %s\n", s->buffer); av_log(h, AV_LOG_DEBUG, "request: %s\n", s->buffer);
if ((err = ffurl_write(s->hd, s->buffer, strlen(s->buffer))) < 0) if ((err = ffurl_write(s->hd, s->buffer, strlen(s->buffer))) < 0)
return err; goto done;
if (s->post_data) if (s->post_data)
if ((err = ffurl_write(s->hd, s->post_data, s->post_datalen)) < 0) if ((err = ffurl_write(s->hd, s->post_data, s->post_datalen)) < 0)
return err; goto done;
/* init input buffer */ /* init input buffer */
s->buf_ptr = s->buffer; s->buf_ptr = s->buffer;
@ -802,15 +799,20 @@ static int http_connect(URLContext *h, const char *path, const char *local_path,
* we've still to send the POST data, but the code calling this * we've still to send the POST data, but the code calling this
* function will check http_code after we return. */ * function will check http_code after we return. */
s->http_code = 200; s->http_code = 200;
return 0; err = 0;
goto done;
} }
/* wait for header */ /* wait for header */
err = http_read_header(h, new_location); err = http_read_header(h, new_location);
if (err < 0) if (err < 0)
return err; goto done;
return (off == s->off) ? 0 : -1; err = (off == s->off) ? 0 : -1;
done:
av_freep(&authstr);
av_freep(&proxyauthstr);
return err;
} }