xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 03:59:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mpjpeg: Cope with multipart lacking the initial CRLF

Browse Source 
Some server in the wild do not put the boundary at a newline
as rfc1347 7.2.1 states.
Cope with that by reading a line and if it is not empty reading
a second one.

Reported-By: bitingsock
This commit is contained in:
Luca Barbato 2015-10-22 05:07:05 +02:00
parent 22f4d9c303
commit 18f9308e6a
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/mpjpegdec.c
View File

@ -153,10 +153,20 @@ static int parse_multipart_header(AVFormatContext *s)
int found_content_type = 0; int found_content_type = 0;
int ret, size = -1; int ret, size = -1;
// get the CRLF as empty string
ret = get_line(s->pb, line, sizeof(line)); ret = get_line(s->pb, line, sizeof(line));
if (ret < 0) if (ret < 0)
return ret; return ret;
/* some implementation do not provide the required
* initial CRLF (see rfc1341 7.2.1)
*/
if (!line[0]) {
ret = get_line(s->pb, line, sizeof(line));
if (ret < 0)
return ret;
}
if (strncmp(line, "--", 2)) if (strncmp(line, "--", 2))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -208,9 +218,6 @@ static int mpjpeg_read_packet(AVFormatContext *s, AVPacket *pkt)
if (ret < 0) if (ret < 0)
return ret; return ret;
// trailing empty line
avio_skip(s->pb, 2);
return 0; return 0;
} }