RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/aviobuf: return error from avio_put_str16le() for invalid input 

Found-by: Stefano Sabatini
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-13 18:48:38 +01:00
parent b52ae27edf
commit 269f5d902a
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/aviobuf.c
View File

@ -319,6 +319,7 @@ int avio_put_str16le(AVIOContext *s, const char *str)
{
const uint8_t *q = str;
int ret = 0;
int err = 0;
while (*q) {
uint32_t ch;
@ -329,8 +330,11 @@ int avio_put_str16le(AVIOContext *s, const char *str)
continue;
invalid:
av_log(s, AV_LOG_ERROR, "Invaid UTF8 sequence in avio_put_str16le\n");
err = AVERROR(EINVAL);
}
avio_wl16(s, 0);
if (err)
return err;
ret += 2;
return ret;
}