diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-30 20:05:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-14 01:29:23 +0200 |
| commit | 52fa7a860318aa871624c7938801492983c24456 (patch) | |
| tree | 7be2bea8017d4d59d98edb94d926677a2e92c511 | |
| parent | d814b9b51ddd3764e809c1d0f82b770e0bc085fd (diff) | |
| download | ffmpeg-52fa7a860318aa871624c7938801492983c24456.tar.gz | |
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>
| -rw-r--r-- | libavutil/log.c | 2 |
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] ", |