From c208b293d780bd7a38eac3815589e75c1e6b168d Mon Sep 17 00:00:00 2001 From: James Darnley Date: Mon, 12 Oct 2026 12:35:32 +0200 Subject: [PATCH 1/3] upipe_vanc_decoder: keep input flow_def attributes The output flow_def was built with uref_sibling_alloc(), which returns an empty uref, so every attribute of the input flow_def was dropped. Instead duplicate the input flow_def like other pipes that change the flow type do. --- lib/upipe-modules/upipe_vanc_decoder.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/upipe-modules/upipe_vanc_decoder.c b/lib/upipe-modules/upipe_vanc_decoder.c index 7b8831f33..34007fa83 100644 --- a/lib/upipe-modules/upipe_vanc_decoder.c +++ b/lib/upipe-modules/upipe_vanc_decoder.c @@ -17,6 +17,7 @@ #include "upipe/upipe_helper_upipe.h" #include "upipe/upipe.h" #include "upipe/uref_block.h" +#include "upipe/uref_block_flow.h" #include "upipe/uref_pic_flow.h" #include "upipe/uref_pic.h" @@ -236,12 +237,13 @@ static int upipe_vanc_decoder_set_flow_def(struct upipe *upipe, if (!ubase_check(uref_flow_match_def(flow_def, "block.vanc.pic.")) && !vancd->rfc8331) return UBASE_ERR_UNHANDLED; - flow_def = uref_sibling_alloc(flow_def); + flow_def = uref_dup(flow_def); if (unlikely(flow_def == NULL)) { upipe_throw_fatal(upipe, UBASE_ERR_ALLOC); return UBASE_ERR_ALLOC; } + uref_block_flow_clear_format(flow_def); uref_flow_set_def(flow_def, "pic."); UBASE_RETURN(uref_pic_flow_set_macropixel(flow_def, 1)) UBASE_RETURN(uref_pic_flow_add_plane(flow_def, 1, 1, 2, "x10")) From f9901b5a7181470e172b235f13415fe29149fde2 Mon Sep 17 00:00:00 2001 From: James Darnley Date: Mon, 12 Oct 2026 12:39:47 +0200 Subject: [PATCH 2/3] upipe_vanc_decoder: fix flow_def leak on error The UBASE_RETURN()s following the output flow_def allocation returned without freeing it. Free it on failure. Also check the result of uref_flow_set_def(). --- lib/upipe-modules/upipe_vanc_decoder.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/upipe-modules/upipe_vanc_decoder.c b/lib/upipe-modules/upipe_vanc_decoder.c index 34007fa83..51117c81a 100644 --- a/lib/upipe-modules/upipe_vanc_decoder.c +++ b/lib/upipe-modules/upipe_vanc_decoder.c @@ -244,9 +244,16 @@ static int upipe_vanc_decoder_set_flow_def(struct upipe *upipe, } uref_block_flow_clear_format(flow_def); - uref_flow_set_def(flow_def, "pic."); - UBASE_RETURN(uref_pic_flow_set_macropixel(flow_def, 1)) - UBASE_RETURN(uref_pic_flow_add_plane(flow_def, 1, 1, 2, "x10")) + int err = uref_flow_set_def(flow_def, "pic."); + if (ubase_check(err)) + err = uref_pic_flow_set_macropixel(flow_def, 1); + if (ubase_check(err)) + err = uref_pic_flow_add_plane(flow_def, 1, 1, 2, "x10"); + if (unlikely(!ubase_check(err))) { + uref_free(flow_def); + return err; + } + upipe_vanc_decoder_store_flow_def(upipe, uref_dup(flow_def)); upipe_vanc_decoder_require_ubuf_mgr(upipe, flow_def); From 205ff89e173d18604a68e58f389f6759a825b76c Mon Sep 17 00:00:00 2001 From: James Darnley Date: Mon, 12 Oct 2026 12:43:09 +0200 Subject: [PATCH 3/3] upipe_vanc_decoder: fix use after free on plane write failure When uref_pic_plane_write() failed, the picture was freed but the loop went on: it wrote through an uninitialized pointer, then used (or freed again) the freed uref. Log an error and drop the rest of the input packet instead, as the other failure paths in the loop do. --- lib/upipe-modules/upipe_vanc_decoder.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/upipe-modules/upipe_vanc_decoder.c b/lib/upipe-modules/upipe_vanc_decoder.c index 51117c81a..4f413be6b 100644 --- a/lib/upipe-modules/upipe_vanc_decoder.c +++ b/lib/upipe-modules/upipe_vanc_decoder.c @@ -177,7 +177,9 @@ static void upipe_vanc_decoder_input(struct upipe *upipe, uint8_t *vanc_buf; if (unlikely(!ubase_check(uref_pic_plane_write(pic, "x10", 0, 0, -1, -1, &vanc_buf)))) { + upipe_err(upipe, "could not write picture plane"); uref_free(pic); + goto ret; } uint16_t *data = (uint16_t*)vanc_buf;