videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

When searching for AMF object field value, try to find that object first 

instead of assuming it should occur right at given position.
This helps finding human-readable error descriptions in RTMP server replies.

Originally committed as revision 20575 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Kostya Shishkov 2009-11-22 09:03:06 +00:00
parent fe52395878
commit 87ca1b8f7f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/rtmppkt.c
View File

@ -233,10 +233,15 @@ int ff_amf_get_field_value(const uint8_t *data, const uint8_t *data_end,
int namelen = strlen(name);
int len;
while (*data != AMF_DATA_TYPE_OBJECT && data < data_end) {
len = ff_amf_tag_size(data, data_end);
if (len < 0)
len = data_end - data;
data += len;
}
if (data_end - data < 3)
return -1;
if (*data++ != AMF_DATA_TYPE_OBJECT)
return -1;
data++;
for (;;) {
int size = bytestream_get_be16(&data);
if (!size)