ffmpeg | branch: release/2.7 | Michael Niedermayer <michae...@gmx.at> | Fri Jun 19 15:57:32 2015 +0200| [23614d09d51178a0be368d5fdf39a6f014f46988] | committer: Michael Niedermayer
avutil/avstring: Do not print NULL Fixes segfault Fixes Ticket4452 Signed-off-by: Michael Niedermayer <michae...@gmx.at> (cherry picked from commit 52e02a9e59f83ede84363d0f035389e44357d4a5) Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=23614d09d51178a0be368d5fdf39a6f014f46988 --- libavutil/avstring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/avstring.c b/libavutil/avstring.c index f785816..5fa295d 100644 --- a/libavutil/avstring.c +++ b/libavutil/avstring.c @@ -502,7 +502,7 @@ int main(void) printf("Testing av_append_path_component()\n"); #define TEST_APPEND_PATH_COMPONENT(path, component, expected) \ fullpath = av_append_path_component((path), (component)); \ - printf("%s = %s\n", fullpath, expected); \ + printf("%s = %s\n", fullpath ? fullpath : "(null)", expected); \ av_free(fullpath); TEST_APPEND_PATH_COMPONENT(NULL, NULL, "(null)") TEST_APPEND_PATH_COMPONENT("path", NULL, "path"); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
