[FFmpeg-devel] [PATCH v2 1/2] avformat/imf: fix CPL parsing error handling

[pal at sandflow.com]

From: Pierre-Anthony Lemieux <pal at palemieux.com>

Signed-off-by: Pierre-Anthony Lemieux <pal at palemieux.com>
---
 libavformat/imf_cpl.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavformat/imf_cpl.c b/libavformat/imf_cpl.c
index 7055b49ae8..f49469f56e 100644
--- a/libavformat/imf_cpl.c
+++ b/libavformat/imf_cpl.c
@@ -807,7 +807,9 @@ 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 {
+        goto clean_up;
+    }
+
         LIBXML_TEST_VERSION
 
         filesize = buf.len;
@@ -817,6 +819,7 @@ int ff_imf_parse_cpl(AVIOContext *in, FFIMFCPL **cpl)
                    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))) {
@@ -833,8 +836,8 @@ int ff_imf_parse_cpl(AVIOContext *in, FFIMFCPL **cpl)
         }
 
         xmlFreeDoc(doc);
-    }
 
+clean_up:
     av_bprint_finalize(&buf, NULL);
 
     return ret;
-- 
2.17.1