[FFmpeg-cvslog] avformat/imf_cpl: Replace NULL content_title_utf8 by ""

Michael Niedermayer git at videolan.org
Mon Oct 30 02:10:21 EET 2023


ffmpeg | branch: release/5.1 | Michael Niedermayer <michael at niedermayer.cc> | Sun Jul 23 23:30:14 2023 +0200| [9b5a8aa16d996f5c3d63a14401efcf7f44b718af] | committer: Michael Niedermayer

avformat/imf_cpl: Replace NULL content_title_utf8 by ""

Suggested-by: Pierre-Anthony Lemieux <pal at sandflow.com>
Reviewed-by: Pierre-Anthony Lemieux <pal at sandflow.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit ac3e6b74bdd6959ce4411e78161b2f06d0926c43)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b5a8aa16d996f5c3d63a14401efcf7f44b718af
---

 libavformat/imf_cpl.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavformat/imf_cpl.c b/libavformat/imf_cpl.c
index a688a44711..3328a3ed18 100644
--- a/libavformat/imf_cpl.c
+++ b/libavformat/imf_cpl.c
@@ -177,6 +177,10 @@ static int fill_content_title(xmlNodePtr cpl_element, FFIMFCPL *cpl)
     cpl->content_title_utf8 = xmlNodeListGetString(cpl_element->doc,
                                                    element->xmlChildrenNode,
                                                    1);
+    if (!cpl->content_title_utf8)
+        cpl->content_title_utf8 = xmlStrdup("");
+    if (!cpl->content_title_utf8)
+        return AVERROR(ENOMEM);
 
     return 0;
 }



More information about the ffmpeg-cvslog mailing list