From 32858e88f6f3248dcbe073a740f33fb5dda330a4 Mon Sep 17 00:00:00 2001
From: Kieran Bingham <kieran.bingham@ideasonboard.com>
Date: Thu, 15 Jul 2021 16:23:34 +0100
Subject: DNI: CTS Workaround for fd leak

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Change-Id: I59d271b5d684787fe7919fad8432df942fa35d53
---
 src/libcamera/ipa_data_serializer.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/libcamera/ipa_data_serializer.cpp b/src/libcamera/ipa_data_serializer.cpp
index fb941e6b..c5b0d4fb 100644
--- a/src/libcamera/ipa_data_serializer.cpp
+++ b/src/libcamera/ipa_data_serializer.cpp
@@ -7,6 +7,8 @@
 
 #include "libcamera/internal/ipa_data_serializer.h"
 
+#include <unistd.h>
+
 #include <libcamera/base/log.h>
 
 /**
@@ -547,7 +549,14 @@ FileDescriptor IPADataSerializer<FileDescriptor>::deserialize(std::vector<uint8_
 
 	ASSERT(!(valid && std::distance(fdsBegin, fdsEnd) < 1));
 
-	return valid ? FileDescriptor(*fdsBegin) : FileDescriptor();
+	FileDescriptor fd = valid ? FileDescriptor(*fdsBegin) : FileDescriptor();
+	if (valid && *fdsBegin != -1) {
+		LOG(IPADataSerializer, Error) << "We probably leaked an fd";
+		close(*fdsBegin);
+		//fdsBegin = -1; /// Can't do this on the const iterator.
+	}
+
+	return fd;
 }
 
 template<>
-- 
cgit v1.2.1