[SCM] libav/experimental: id3v2: check for enough space to write full UTF-8 characters. patch by Anton Khirnov, wyskas gmail com

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 787f8fad00c66fc225662f7defb90e79c112ed40
Author: Anton Khirnov <wyskas at gmail.com>
Date:   Wed Sep 23 18:04:40 2009 +0000

    id3v2: check for enough space to write full UTF-8 characters.
    patch by Anton Khirnov, wyskas gmail com
    
    Originally committed as revision 20004 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index 0cf2cb1..8070a4a 100644
--- a/libavformat/id3v2.c
+++ b/libavformat/id3v2.c
@@ -92,9 +92,9 @@ static void read_ttag(AVFormatContext *s, int taglen, const char *key)
 
     case 0:  /* ISO-8859-1 (0 - 255 maps directly into unicode) */
         q = dst;
-        while (taglen--) {
+        while (taglen-- && q - dst < dstlen - 7) {
             uint8_t tmp;
-            PUT_UTF8(get_byte(s->pb), tmp, if (q - dst < dstlen - 1) *q++ = tmp;)
+            PUT_UTF8(get_byte(s->pb), tmp, *q++ = tmp;)
         }
         *q = '\0';
         break;

-- 
Libav/FFmpeg packaging