[FFmpeg-devel] [PATCH]lavf/mov: Only copy extradata if it exists.
Hi!
Attached patch fixes an ubsan warning like the following here:
libavformat/mov.c:2332:13: runtime error: null pointer passed as argument 2,
which is declared to never be null
Please comment, Carl Eugen
From b117fdd2adf3271fcaf8f9388866aaf115284f74 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos
Date: Tue, 18 Apr 2017 10:56:31 +0200
Subject: [PATCH] lavf/mov: Only copy extradata if it exists.
Avoids undefined call of memcpy(ptr, NULL, 0);
---
libavformat/mov.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 2995a00..03fd90e 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2321,7 +2321,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext
*pb, int entries)
} else if (a.size > 0)
avio_skip(pb, a.size);
-if (sc->extradata) {
+if (sc->extradata && st->codecpar->extradata) {
int extra_size = st->codecpar->extradata_size;
/* Move the current stream extradata to the stream context one. */
--
1.7.10.4
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH]lavf/mov: Only copy extradata if it exists.
On Tue, Apr 18, 2017 at 10:59:31AM +0200, Carl Eugen Hoyos wrote: > Hi! > > Attached patch fixes an ubsan warning like the following here: > libavformat/mov.c:2332:13: runtime error: null pointer passed as argument 2, > which is declared to never be null > > Please comment, Carl Eugen > mov.c |2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > 6e412b49316b5c6529c476233d54723c24b1d740 > 0001-lavf-mov-Only-copy-extradata-if-it-exists.patch > From b117fdd2adf3271fcaf8f9388866aaf115284f74 Mon Sep 17 00:00:00 2001 > From: Carl Eugen Hoyos > Date: Tue, 18 Apr 2017 10:56:31 +0200 > Subject: [PATCH] lavf/mov: Only copy extradata if it exists. > > Avoids undefined call of memcpy(ptr, NULL, 0); > --- > libavformat/mov.c |2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) LGTM thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Avoid a single point of failure, be that a person or equipment. signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH]lavf/mov: Only copy extradata if it exists.
2017-04-18 16:33 GMT+02:00 Michael Niedermayer : > On Tue, Apr 18, 2017 at 10:59:31AM +0200, Carl Eugen Hoyos wrote: >> Hi! >> >> Attached patch fixes an ubsan warning like the following here: >> libavformat/mov.c:2332:13: runtime error: null pointer passed as argument 2, >> which is declared to never be null >> >> Please comment, Carl Eugen > >> mov.c |2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> 6e412b49316b5c6529c476233d54723c24b1d740 >> 0001-lavf-mov-Only-copy-extradata-if-it-exists.patch >> From b117fdd2adf3271fcaf8f9388866aaf115284f74 Mon Sep 17 00:00:00 2001 >> From: Carl Eugen Hoyos >> Date: Tue, 18 Apr 2017 10:56:31 +0200 >> Subject: [PATCH] lavf/mov: Only copy extradata if it exists. >> >> Avoids undefined call of memcpy(ptr, NULL, 0); >> --- >> libavformat/mov.c |2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > LGTM Patch applied. Thank you, Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
