[FFmpeg-cvslog] avutil/log: Fix context pointer used for get_category()
Michael Niedermayer
git at videolan.org
Thu May 9 22:52:29 CEST 2013
ffmpeg | branch: release/1.2 | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 30 20:05:31 2013 +0200| [cc0dd86580b3257f22a4981a79eb5fa6804182b6] | committer: Michael Niedermayer
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 at gmx.at>
(cherry picked from commit 7edb984dd051b6919d7d8471c70499273f31b0fa)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cc0dd86580b3257f22a4981a79eb5fa6804182b6
---
libavutil/log.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavutil/log.c b/libavutil/log.c
index 700e89f..49dd4d1 100644
--- a/libavutil/log.c
+++ b/libavutil/log.c
@@ -178,7 +178,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] ",
More information about the ffmpeg-cvslog
mailing list