lol

Author: quarium

lib/upipe-av/upipe_avfilter.c

@@ -963,7 +963,6 @@ static int upipe_avfilt_avframe_from_uref_pic(struct upipe *upipe,
 
     int err = upipe_av_set_frame_properties(upipe, frame, flow_def, uref);
     if (!ubase_check(err)) {
-        uref_free(uref);
         return err;
     }
 
@@ -984,7 +983,6 @@ static int upipe_avfilt_avframe_from_uref_pic(struct upipe *upipe,
 
 inval:
     upipe_warn(upipe, "invalid buffer received");
-    uref_free(uref);
     return UBASE_ERR_INVALID;
 }
 
@@ -1055,7 +1053,6 @@ static int upipe_avfilt_avframe_from_uref_sound(struct upipe *upipe,
 
 inval:
     upipe_warn(upipe, "invalid buffer received");
-    uref_free(uref);
     return UBASE_ERR_INVALID;
 }
 
@@ -1073,7 +1070,10 @@ static int upipe_avfilt_avframe_from_uref(struct upipe *upipe,
                                           struct uref *flow_def,
                                           AVFrame *frame)
 {
-    if (ubase_check(uref_flow_match_def(flow_def, UREF_PIC_FLOW_DEF)))
+    if (unlikely(!flow_def)) {
+        upipe_warn(upipe, "no flow def set");
+        return UBASE_ERR_INVALID;
+    } else if (ubase_check(uref_flow_match_def(flow_def, UREF_PIC_FLOW_DEF)))
         return upipe_avfilt_avframe_from_uref_pic(
             upipe, uref, flow_def, frame);
     else if (ubase_check(uref_flow_match_def(flow_def, UREF_SOUND_FLOW_DEF)))
@@ -1129,6 +1129,7 @@ static void upipe_avfilt_sub_input(struct upipe *upipe,
                                                  frame);
         if (unlikely(!ubase_check(ret))) {
             upipe_throw_error(upipe, ret);
+            uref_free(uref);
             av_frame_free(&frame);
             return;
         }
@@ -1930,11 +1931,13 @@ static void upipe_avfilt_input(struct upipe *upipe,
     upipe_avfilt->uref = uref;
 
     if (!ubase_check(ubuf_av_get_avframe(uref->ubuf, frame))) {
-        ret = upipe_avfilt_avframe_from_uref(upipe, uref_dup(uref),
+        struct uref *uref_tmp = uref_dup(uref);
+        ret = upipe_avfilt_avframe_from_uref(upipe, uref_tmp,
                                              upipe_avfilt->flow_def_input,
                                              frame);
         if (!ubase_check(ret)) {
             upipe_throw_error(upipe, ret);
+            uref_free(uref_tmp);
             goto end;
         }
     }

tests/Makefile.am

@@ -259,6 +259,13 @@ TESTS += \
 endif
 endif
 
+if HAVE_AVFILTER
+check_PROGRAMS += \
+	upipe_avfilter_test
+TESTS += \
+	upipe_avfilter_test
+endif
+
 if HAVE_GLX
 check_PROGRAMS += upipe_glx_sink_test
 endif
@@ -494,6 +501,8 @@ upipe_avcodec_test_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS)
 upipe_avcodec_test_LDADD = $(LDADD) -lev $(top_builddir)/lib/upump-ev/libupump_ev.la $(top_builddir)/lib/upipe-modules/libupipe_modules.la $(top_builddir)/lib/upipe-av/libupipe_av.la $(AVFORMAT_LIBS) -lpthread
 upipe_avcodec_decode_test_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS)
 upipe_avcodec_decode_test_LDADD = $(LDADD) -lev $(top_builddir)/lib/upump-ev/libupump_ev.la $(top_builddir)/lib/upipe-modules/libupipe_modules.la $(top_builddir)/lib/upipe-av/libupipe_av.la $(AVFORMAT_LIBS) -lpthread
+upipe_avfilter_test_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS)
+upipe_avfilter_test_LDADD = $(LDADD) -lev $(top_builddir)/lib/upump-ev/libupump_ev.la $(top_builddir)/lib/upipe-av/libupipe_av.la $(top_builddir)/lib/upipe-modules/libupipe_modules.la $(AVFORMAT_LIBS)
 
 upipe_sws_test_CFLAGS = $(AM_CFLAGS) $(SWSCALE_CFLAGS)
 upipe_sws_test_LDADD = $(LDADD) $(SWSCALE_LIBS) $(top_builddir)/lib/upipe-swscale/libupipe_swscale.la