vf_psnr/ssim: don't crash if stats_file is NULL.

0c7b44a0 · Ronald S. Bultje · a60539bb · 0c7b44a0 · 0c7b44a0
隐藏空白更改
内联并排

Showing with 26 addition and 22 deletion

libavfilter/vf_psnr.c libavfilter/vf_psnr.c +13 -11

libavfilter/vf_ssim.c libavfilter/vf_ssim.c +13 -11

未找到文件。
--- a/libavfilter/vf_psnr.c
+++ b/libavfilter/vf_psnr.c
@@ -193,17 +193,19 @@ static av_cold int init(AVFilterContext *ctx)
    s->min_mse = +INFINITY;
    s->max_mse = -INFINITY;
-    if (!strcmp(s->stats_file_str, "-")) {
+    if (s->stats_file_str) {
-        s->stats_file = stdout;
+        if (!strcmp(s->stats_file_str, "-")) {
-    } else if (s->stats_file_str) {
+            s->stats_file = stdout;
-        s->stats_file = fopen(s->stats_file_str, "w");
+        } else {
-        if (!s->stats_file) {
+            s->stats_file = fopen(s->stats_file_str, "w");
-            int err = AVERROR(errno);
+            if (!s->stats_file) {
-            char buf[128];
+                int err = AVERROR(errno);
-            av_strerror(err, buf, sizeof(buf));
+                char buf[128];
-            av_log(ctx, AV_LOG_ERROR, "Could not open stats file %s: %s\n",
+                av_strerror(err, buf, sizeof(buf));
-                   s->stats_file_str, buf);
+                av_log(ctx, AV_LOG_ERROR, "Could not open stats file %s: %s\n",
-            return err;
+                       s->stats_file_str, buf);
+                return err;
+            }
        }
    }

--- a/libavfilter/vf_ssim.c
+++ b/libavfilter/vf_ssim.c
@@ -223,17 +223,19 @@ static av_cold int init(AVFilterContext *ctx)
 {
    SSIMContext *s = ctx->priv;
-    if (!strcmp(s->stats_file_str, "-")) {
+    if (s->stats_file_str) {
-        s->stats_file = stdout;
+        if (!strcmp(s->stats_file_str, "-")) {
-    } else if (s->stats_file_str) {
+            s->stats_file = stdout;
-        s->stats_file = fopen(s->stats_file_str, "w");
+        } else {
-        if (!s->stats_file) {
+            s->stats_file = fopen(s->stats_file_str, "w");
-            int err = AVERROR(errno);
+            if (!s->stats_file) {
-            char buf[128];
+                int err = AVERROR(errno);
-            av_strerror(err, buf, sizeof(buf));
+                char buf[128];
-            av_log(ctx, AV_LOG_ERROR, "Could not open stats file %s: %s\n",
+                av_strerror(err, buf, sizeof(buf));
-                   s->stats_file_str, buf);
+                av_log(ctx, AV_LOG_ERROR, "Could not open stats file %s: %s\n",
-            return err;
+                       s->stats_file_str, buf);
+                return err;
+            }
        }
    }