[FFmpeg-cvslog] avformat/aviobuf: Fix end check in put_str16()

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michael at niedermayer.cc> | Wed Jan 13 02:31:59 2016 +0100| [66aeb5467eeeeab310a98332817a908ca68f42c7] | committer: Michael Niedermayer

avformat/aviobuf: Fix end check in put_str16()

Fixes out of array read
Fixes: 03c406ec9530e594a074ce2979f8a1f0/asan_heap-oob_7dec26_4664_37c52495b2870a2eaac65f53958e76c1.flac

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 115fb6d03ef6310732b42258d8c3cd1839cfb74b)

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=66aeb5467eeeeab310a98332817a908ca68f42c7
---

 libavformat/aviobuf.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 74686d1..7da89d7 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -356,6 +356,8 @@ int avio_put_str16le(AVIOContext *s, const char *str)
 invalid:
         av_log(s, AV_LOG_ERROR, "Invaid UTF8 sequence in avio_put_str16le\n");
         err = AVERROR(EINVAL);
+        if (!*(q-1))
+            break;
     }
     avio_wl16(s, 0);
     if (err)