From 190eafeaa6991d8ed42bc9a80f5deebeb46d1c1c Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Wed, 28 Apr 2021 14:38:08 +0200 Subject: [PATCH] base: handle 'unpack_string()' error in 'Arg::string()' Fixes #4100 --- repos/base/include/util/arg_string.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/repos/base/include/util/arg_string.h b/repos/base/include/util/arg_string.h index 610fbb16b3..51a3168873 100644 --- a/repos/base/include/util/arg_string.h +++ b/repos/base/include/util/arg_string.h @@ -186,7 +186,8 @@ class Genode::Arg /* unpack string to dst */ size_t num_chars = min(dst_len - 1, _value.len()); - unpack_string(_value.start(), dst, num_chars); + if (unpack_string(_value.start(), dst, num_chars) < 0) + copy_cstring(dst, default_string, dst_len); } /**