patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

lib: os: cbprintf: Fix size miscalculation in cbprintf_convert

Browse source 
When package contained RO string positions and flag indicates that
they shall not be kept, length was miscalculated which could lead
to failures (e.g. memory corruption).

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruściński 2023-12-20 15:53:05 +01:00 committed by Fabio Baltieri
parent b46d961abf
commit c48d61a4b4
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/os/cbprintf_packaged.c
View file

@ -982,10 +982,8 @@ int cbprintf_package_convert(void *in_packaged,
str_pos++; str_pos++;
} }
} else { } else {
if (ros_nbr && flags & CBPRINTF_PACKAGE_CONVERT_KEEP_RO_STR) {
str_pos += ros_nbr; str_pos += ros_nbr;
} }
}
bool drop_ro_str_pos = !(flags & bool drop_ro_str_pos = !(flags &
(CBPRINTF_PACKAGE_CONVERT_KEEP_RO_STR | (CBPRINTF_PACKAGE_CONVERT_KEEP_RO_STR |