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

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

[pal]

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

Signed-off-by: Pierre-Anthony Lemieux <pal@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

_______________________________________________
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".

[FFmpeg-devel] [PATCH v2 2/2] avformat/imf: Fix indentation

[pal]

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

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

diff --git a/libavformat/imf_cpl.c b/libavformat/imf_cpl.c
index f49469f56e..32e805cdd4 100644
--- a/libavformat/imf_cpl.c
+++ b/libavformat/imf_cpl.c
@@ -810,32 +810,32 @@ int ff_imf_parse_cpl(AVIOContext *in, FFIMFCPL **cpl)
         goto clean_up;
     }
 
-        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;
-        }
+    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));
-        }
+    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);
+    xmlFreeDoc(doc);
 
 clean_up:
     av_bprint_finalize(&buf, NULL);
-- 
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".

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

[Zane van Iperen]

On 5/1/22 12:42, pal@sandflow.com wrote:
> From: Pierre-Anthony Lemieux <pal@palemieux.com>
> 
> Signed-off-by: Pierre-Anthony Lemieux <pal@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;
> +    }
> +

Patchset lgtm
_______________________________________________
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".