virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

avformat/http: check the auth string contents not the pointer which cannot be NULL

Browse Source 
It appears this bug originates from a "work in progress" patch from
ffmpeg-devel that was heavily redesigned by and integrated in libav

And that patch even had a reply and review on the mailing list pointing
out that it had a bug.

This fixes a deadlock with ffserver

See: [FFmpeg-devel] [PATCH] Fix HTTP authentication problem for POST actions.
     [FFmpeg-devel] [PATCH 1/3] Introduce auth_phase flag, which will be true if authorization needs to be sent, but the type of authorization is not known yet Partial fix #3036
     [FFmpeg-devel] [PATCH 2/3] Only add Transfer-Encoding header when not in authorization phase, because server will wait (indefinitely) for data when receiving this header Partial fix #3036
     [FFmpeg-devel] [PATCH 3/3] Only allow posting data and/or forcing a 200 code, enabling posting isml chunks, -after- we did a possible first request to get a 403 from the server telling us which type of authentication to apply Final part fix #3036
See: 71549a857b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-14 00:56:32 +02:00
parent 6b1b63df85
commit 5970f4bb02
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/http.c
View File

@ -609,7 +609,7 @@ static int http_connect(URLContext *h, const char *path, const char *local_path,
* send Expect: 100-continue to get the 401 response including the * send Expect: 100-continue to get the 401 response including the
* WWW-Authenticate header, or an 100 continue if no auth actually * WWW-Authenticate header, or an 100 continue if no auth actually
* is needed. */ * is needed. */
if (auth && s->auth_state.auth_type == HTTP_AUTH_NONE && if (*auth && s->auth_state.auth_type == HTTP_AUTH_NONE &&
s->http_code != 401) s->http_code != 401)
send_expect_100 = 1; send_expect_100 = 1;
} }