Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-10 17:09:07 +0300
committerMichael Niedermayer <michaelni@gmx.at>2015-06-10 03:13:11 +0300
commitfdc62caf3075d02c0a65368cd43c98dde04e4185 (patch)
tree7450a65bd65b33973c850133b0516546e299cbc6 /libavutil
parent998d943cce73ac186cc002786f79db6fd46e4b75 (diff)
avutil/dict: Use size_t for appending strings
the string length is not constrained to INT_MAX Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 4c128ea1629116fc4936edc5f96bbd18f3ef1647) Conflicts: libavutil/dict.c
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/dict.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/dict.c b/libavutil/dict.c
index 3a0e84cd40..73dbfd55a0 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);