* [FFmpeg-devel] [PATCH v1] avformat/imf: fix error CPL root element is absent
@ 2022-01-04 6:11 pal
2022-01-05 0:37 ` Zane van Iperen
0 siblings, 1 reply; 2+ messages in thread
From: pal @ 2022-01-04 6:11 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Pierre-Anthony Lemieux
From: Pierre-Anthony Lemieux <pal@palemieux.com>
Signed-off-by: Pierre-Anthony Lemieux <pal@palemieux.com>
---
Notes:
Found through manual fuzzing.
libavformat/imf_cpl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/imf_cpl.c b/libavformat/imf_cpl.c
index 7055b49ae8..167244a5a2 100644
--- a/libavformat/imf_cpl.c
+++ b/libavformat/imf_cpl.c
@@ -688,7 +688,7 @@ int ff_imf_parse_cpl_from_xml_dom(xmlDocPtr doc, FFIMFCPL **cpl)
}
cpl_element = xmlDocGetRootElement(doc);
- if (xmlStrcmp(cpl_element->name, "CompositionPlaylist")) {
+ if ((!cpl_element) || xmlStrcmp(cpl_element->name, "CompositionPlaylist")) {
av_log(NULL, AV_LOG_ERROR, "The root element of the CPL is not CompositionPlaylist\n");
ret = AVERROR_INVALIDDATA;
goto cleanup;
--
2.17.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [FFmpeg-devel] [PATCH v1] avformat/imf: fix error CPL root element is absent
2022-01-04 6:11 [FFmpeg-devel] [PATCH v1] avformat/imf: fix error CPL root element is absent pal
@ 2022-01-05 0:37 ` Zane van Iperen
0 siblings, 0 replies; 2+ messages in thread
From: Zane van Iperen @ 2022-01-05 0:37 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Pierre-Anthony Lemieux
On 4/1/22 16:11, pal@sandflow.com wrote:
> cpl_element = xmlDocGetRootElement(doc);
> - if (xmlStrcmp(cpl_element->name, "CompositionPlaylist")) {
> + if ((!cpl_element) || xmlStrcmp(cpl_element->name, "CompositionPlaylist")) {
Nit: Extra set of parens around "!cpl_element".
Otherwise, this lgtm, I'll apply and backport this soon with that change.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-01-05 0:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-04 6:11 [FFmpeg-devel] [PATCH v1] avformat/imf: fix error CPL root element is absent pal
2022-01-05 0:37 ` Zane van Iperen
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git