lib: os: cbprintf: Fix size miscalculation in cbprintf_convert

nordic-krch · fabiobaltieri · commit c48d61a4b464 · 2023-12-28T12:18:50.000Z
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 &lt;krzysztof.chruscinski@nordicsemi.no&gt;
diff --git a/lib/os/cbprintf_packaged.c b/lib/os/cbprintf_packaged.c
@@ -982,9 +982,7 @@ int cbprintf_package_convert(void *in_packaged,
 				str_pos++;
 			}
 		} 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 &

Original file line number	Diff line number	Diff line change
`@@ -982,9 +982,7 @@ int cbprintf_package_convert(void *in_packaged,`
`982`	`982`	`str_pos++;`
`983`	`983`	`}`
`984`	`984`	`} else {`
`985`		`- if (ros_nbr && flags & CBPRINTF_PACKAGE_CONVERT_KEEP_RO_STR) {`
`986`		`- str_pos += ros_nbr;`
`987`		`- }`
	`985`	`+ str_pos += ros_nbr;`
`988`	`986`	`}`
`989`	`987`
`990`	`988`	`bool drop_ro_str_pos = !(flags &`