From: pal@sandflow.com
To: ffmpeg-devel@ffmpeg.org
Cc: Pierre-Anthony Lemieux <pal@palemieux.com>
Subject: [FFmpeg-devel] [PATCH v1] avformat/imf: fix CPL parsing error handling
Date: Mon, 3 Jan 2022 22:10:56 -0800
Message-ID: <20220104061056.32737-1-pal@sandflow.com> (raw)
From: Pierre-Anthony Lemieux <pal@palemieux.com>
Signed-off-by: Pierre-Anthony Lemieux <pal@palemieux.com>
---
libavformat/imf_cpl.c | 51 +++++++++++++++++++++++--------------------
1 file changed, 27 insertions(+), 24 deletions(-)
diff --git a/libavformat/imf_cpl.c b/libavformat/imf_cpl.c
index 167244a5a2..72fc7ffec8 100644
--- a/libavformat/imf_cpl.c
+++ b/libavformat/imf_cpl.c
@@ -807,34 +807,37 @@ int ff_imf_parse_cpl(AVIOContext *in, FFIMFCPL **cpl)
av_log(NULL, AV_LOG_ERROR, "Cannot read IMF CPL\n");
if (ret == 0)
ret = AVERROR_INVALIDDATA;
- } else {
- LIBXML_TEST_VERSION
-
- filesize = buf.len;
- doc = xmlReadMemory(buf.str, filesize, NULL, NULL, 0);
- if (!doc) {
- av_log(NULL,
- AV_LOG_ERROR,
- "XML parsing failed when reading the IMF CPL\n");
- ret = AVERROR_INVALIDDATA;
- }
+ goto clean_up;
+ }
- if ((ret = ff_imf_parse_cpl_from_xml_dom(doc, cpl))) {
- av_log(NULL, AV_LOG_ERROR, "Cannot parse IMF CPL\n");
- } else {
- av_log(NULL,
- AV_LOG_INFO,
- "IMF CPL ContentTitle: %s\n",
- (*cpl)->content_title_utf8);
- av_log(NULL,
- AV_LOG_INFO,
- "IMF CPL Id: " FF_IMF_UUID_FORMAT "\n",
- UID_ARG((*cpl)->id_uuid));
- }
+ LIBXML_TEST_VERSION
- xmlFreeDoc(doc);
+ filesize = buf.len;
+ doc = xmlReadMemory(buf.str, filesize, NULL, NULL, 0);
+ if (!doc) {
+ av_log(NULL,
+ AV_LOG_ERROR,
+ "XML parsing failed when reading the IMF CPL\n");
+ ret = AVERROR_INVALIDDATA;
+ goto clean_up;
}
+ if ((ret = ff_imf_parse_cpl_from_xml_dom(doc, cpl))) {
+ av_log(NULL, AV_LOG_ERROR, "Cannot parse IMF CPL\n");
+ } else {
+ av_log(NULL,
+ AV_LOG_INFO,
+ "IMF CPL ContentTitle: %s\n",
+ (*cpl)->content_title_utf8);
+ av_log(NULL,
+ AV_LOG_INFO,
+ "IMF CPL Id: " FF_IMF_UUID_FORMAT "\n",
+ UID_ARG((*cpl)->id_uuid));
+ }
+
+ xmlFreeDoc(doc);
+
+clean_up:
av_bprint_finalize(&buf, NULL);
return ret;
--
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".
next reply other threads:[~2022-01-04 6:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-04 6:10 pal [this message]
2022-01-05 0:58 ` Zane van Iperen
2022-01-05 2:44 ` Pierre-Anthony Lemieux
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220104061056.32737-1-pal@sandflow.com \
--to=pal@sandflow.com \
--cc=ffmpeg-devel@ffmpeg.org \
--cc=pal@palemieux.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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