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>2013-04-30 22:05:31 +0400
committerMichael Niedermayer <michaelni@gmx.at>2013-05-14 03:29:23 +0400
commit52fa7a860318aa871624c7938801492983c24456 (patch)
tree7be2bea8017d4d59d98edb94d926677a2e92c511 /libavutil
parentd814b9b51ddd3764e809c1d0f82b770e0bc085fd (diff)
avutil/log: Fix context pointer used for get_category()
Fixes calling a random pointer Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 7edb984dd051b6919d7d8471c70499273f31b0fa) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/log.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/log.c b/libavutil/log.c
index 1bae1b2165..90a46b0650 100644
--- a/libavutil/log.c
+++ b/libavutil/log.c
@@ -177,7 +177,7 @@ static void format_line(void *ptr, int level, const char *fmt, va_list vl,
if (parent && *parent) {
snprintf(part[0], part_size, "[%s @ %p] ",
(*parent)->item_name(parent), parent);
- if(type) type[0] = get_category(((uint8_t *) ptr) + avc->parent_log_context_offset);
+ if(type) type[0] = get_category(parent);
}
}
snprintf(part[1], part_size, "[%s @ %p] ",