[SCM] libav/experimental: matroskadec: use more robust av_strlcpy() instead of strcpy()

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:26:40 UTC 2013


The following commit has been merged in the experimental branch:
commit 5f8e022701ba2f0f4ef27b25845bec69928c4061
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Tue Aug 5 00:39:47 2008 +0000

    matroskadec: use more robust av_strlcpy() instead of strcpy()
    
    Originally committed as revision 14548 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index ba7580a..34501df 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -35,6 +35,7 @@
 #include "matroska.h"
 #include "libavcodec/mpeg4audio.h"
 #include "libavutil/intfloat_readwrite.h"
+#include "libavutil/avstring.h"
 #include "libavutil/lzo.h"
 #ifdef CONFIG_ZLIB
 #include <zlib.h>
@@ -2651,7 +2652,7 @@ matroska_read_header (AVFormatContext    *s,
             st->codec->codec_id = codec_id;
             st->start_time = 0;
             if (strcmp(track->language, "und"))
-                strcpy(st->language, track->language);
+                av_strlcpy(st->language, track->language, 4);
 
             if (track->flags & MATROSKA_TRACK_DEFAULT)
                 st->disposition |= AV_DISPOSITION_DEFAULT;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list