Module: libav Branch: release/0.7 Commit: 151aaf539f0d1010471f916082742b3d80da1359
Author: Martin Storsjö <[email protected]> Committer: Reinhard Tartler <[email protected]> Date: Fri Sep 30 20:30:35 2011 +0300 lavf: Avoid using av_malloc(0) in av_dump_format On OS X, av_malloc(0) returns pointers that cause crashes when freed. Signed-off-by: Martin Storsjö <[email protected]> (cherry picked from commit e81e5e8ad2bb5746df0c343c396019aca165cf66) Signed-off-by: Anton Khirnov <[email protected]> --- libavformat/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index aa3ca59..65176d4 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3320,7 +3320,7 @@ void av_dump_format(AVFormatContext *ic, int is_output) { int i; - uint8_t *printed = av_mallocz(ic->nb_streams); + uint8_t *printed = ic->nb_streams ? av_mallocz(ic->nb_streams) : NULL; if (ic->nb_streams && !printed) return; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
