From f1c7e0f2a86c2eb7b5200319280362f53a7447d1 Mon Sep 17 00:00:00 2001
From: Philipp Jungkamp <Philipp.Jungkamp@opal-rt.com>
Date: Fri, 23 Jun 2023 13:02:55 +0200
Subject: [PATCH] path: Fix leaking samples

Signed-off-by: Philipp Jungkamp <Philipp.Jungkamp@opal-rt.com>
---
 lib/path_source.cpp | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/lib/path_source.cpp b/lib/path_source.cpp
index 3fadf1153..1ddd015c1 100644
--- a/lib/path_source.cpp
+++ b/lib/path_source.cpp
@@ -44,7 +44,7 @@ PathSource::~PathSource()
 
 int PathSource::read(int i)
 {
-	int ret, recv, tomux, allocated, cnt, toenqueue, enqueued = 0;
+	int ret, recv, tomux, allocated, cnt, toenqueue, enqueued = 0, muxed_initialized = 0;
 
 	cnt = node->in.vectorize;
 
@@ -61,19 +61,19 @@ int PathSource::read(int i)
 	recv = node->read(read_smps, allocated);
 	if (recv == 0) {
 		enqueued = 0;
-		goto out2;
+		goto read_decref_read_smps;
 	}
 	else if (recv < 0) {
 		if (node->getState() == State::STOPPING) {
 			path->state = State::STOPPING;
 
 			enqueued = -1;
-			goto out2;
+			goto read_decref_read_smps;
 		}
 		else {
 			path->logger->error("Failed to read samples from node {}", node->getName());
 			enqueued = 0;
-			goto out2;
+			goto read_decref_read_smps;
 		}
 	}
 	else if (recv < allocated)
@@ -97,7 +97,9 @@ int PathSource::read(int i)
 			: sample_clone(muxed_smps[i-1]);
 		if (!muxed_smps[i]) {
 			path->logger->error("Pool underrun in path {}", path->toString());
-			return -1;
+			muxed_initialized = i == 0 ? 0 : i-1;
+			enqueued = -1;
+			goto read_decref_muxed_smps;
 		}
 
 		if (path->original_sequence_no) {
@@ -119,12 +121,16 @@ int PathSource::read(int i)
 		muxed_smps[i]->flags |= tomux_smps[i]->flags & (int) SampleFlags::HAS_TS;
 
 		ret = mappings.remap(muxed_smps[i], tomux_smps[i]);
-		if (ret)
-			return ret;
+		if (ret < 0) {
+			enqueued = ret;
+			muxed_initialized = i;
+			goto read_decref_muxed_smps;
+		}
 
 		if (muxed_smps[i]->length > 0)
 			muxed_smps[i]->flags |= (int) SampleFlags::HAS_DATA;
 	}
+	muxed_initialized = tomux;
 
 	sample_copy(path->last_sample, muxed_smps[tomux-1]);
 
@@ -169,8 +175,10 @@ int PathSource::read(int i)
 	else
 		enqueued = 0;
 
-	sample_decref_many(muxed_smps, tomux);
-out2:	sample_decref_many(read_smps, recv);
+read_decref_muxed_smps:
+	sample_decref_many(muxed_smps, muxed_initialized);
+read_decref_read_smps:
+	sample_decref_many(read_smps, allocated);
 
 	return enqueued;
 }