From db42bcbea12f4e5a7b1fbecb001380d62b03f23f Mon Sep 17 00:00:00 2001
From: Christoph Pohl <christoph.pohl@kit.edu>
Date: Wed, 11 Jan 2023 10:04:14 +0100
Subject: [PATCH] fix infinitely growing bufferSize
---
.../units/RobotUnit/util/ControlThreadOutputBuffer.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.cpp b/source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.cpp
index ed230762d..26a7dd83d 100644
--- a/source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.cpp
+++ b/source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.cpp
@@ -338,7 +338,7 @@ namespace armarx
<< " bytes for messages buffer, but the maximal buffer size is "
<< getMaximalBufferSize();
}
- bufferSize = std::max(requiredSpace, getMaximalBufferSize());
+ bufferSize = std::min(requiredSpace, getMaximalBufferSize());
buffer.resize(bufferSize, 0);
requiredAdditionalBufferSpace = 0;
messagesLost = 0;
--
GitLab