lavfi/frei0r: in init() check path loop, free resources in a single point
authorStefano Sabatini <stefasab@gmail.com>
Fri, 16 Nov 2012 09:58:37 +0000 (10:58 +0100)
committerStefano Sabatini <stefasab@gmail.com>
Sun, 18 Nov 2012 15:52:46 +0000 (16:52 +0100)
libavfilter/vf_frei0r.c

index 9604b46..7e89e57 100644 (file)
@@ -237,19 +237,21 @@ static av_cold int frei0r_init(AVFilterContext *ctx,
             /* add additional trailing slash in case it is missing */
             char *p1 = av_asprintf("%s/", p);
             if (!p1) {
-                av_free(path);
-                return AVERROR(ENOMEM);
+                ret = AVERROR(ENOMEM);
+                goto check_path_end;
             }
             ret = load_path(ctx, &frei0r->dl_handle, p1, dl_name);
             av_free(p1);
-            if (ret < 0) {
-                av_free(path);
-                return ret;
-            }
+            if (ret < 0)
+                goto check_path_end;
             if (frei0r->dl_handle)
                 break;
         }
+
+    check_path_end:
         av_free(path);
+        if (ret < 0)
+            return ret;
     }
     if (!frei0r->dl_handle && (path = getenv("HOME"))) {
         char *prefix = av_asprintf("%s/.frei0r-1/lib/", path);