[FFmpeg-cvslog] avutil/dict: Use size_t for appending strings

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Sun May 
10 16:09:07 2015 +0200| [0b6c8bb26c623ec1f6484cb1071c67ad1f9662db] | committer: 
Michael Niedermayer

avutil/dict: Use size_t for appending strings

the string length is not constrained to INT_MAX

Signed-off-by: Michael Niedermayer <michae...@gmx.at>
(cherry picked from commit 4c128ea1629116fc4936edc5f96bbd18f3ef1647)

Conflicts:

        libavutil/dict.c

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

 libavutil/dict.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/dict.c b/libavutil/dict.c
index 3a0e84c..73dbfd5 100644
--- a/libavutil/dict.c
+++ b/libavutil/dict.c
@@ -92,7 +92,7 @@ int av_dict_set(AVDictionary **pm, const char *key, const 
char *value, int flags
         if (flags & AV_DICT_DONT_STRDUP_VAL) {
             m->elems[m->count].value = (char*)(intptr_t)value;
         } else if (oldval && flags & AV_DICT_APPEND) {
-            int len = strlen(oldval) + strlen(value) + 1;
+            size_t len = strlen(oldval) + strlen(value) + 1;
             char *newval = av_mallocz(len);
             if (!newval)
                 return AVERROR(ENOMEM);

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog