aboutsummaryrefslogtreecommitdiff
path: root/py/objstr.c
diff options
context:
space:
mode:
authorJoris Peeraer <jorispeeraer@gmail.com>2020-10-22 10:38:03 +0200
committerDamien George <damien@micropython.org>2020-12-07 23:32:06 +1100
commit5020b14d5419065f1a5ef5aed1be7badee28c9bf (patch)
tree3a5ecda9ef9027206a3dbb4c3df5fab99803a32d /py/objstr.c
parentdde0735ac1629aca4f7d41334f25b75dd8d35010 (diff)
py/mpprint: Fix length calculation for strings with precision-modifier.
Two issues are tackled: 1. The calculation of the correct length to print is fixed to treat the precision as a maximum length instead as the exact length. This is done for both qstr (%q) and for regular str (%s). 2. Fix the incorrect use of mp_printf("%.*s") to mp_print_strn(). Because of the fix of above issue, some testcases that would print an embedded null-byte (^@ in test-output) would now fail. The bug here is that "%s" was used to print null-bytes. Instead, mp_print_strn is used to make sure all bytes are outputted and the exact length is respected. Test-cases are added for both %s and %q with a combination of precision and padding specifiers.
Diffstat (limited to 'py/objstr.c')
-rw-r--r--py/objstr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/py/objstr.c b/py/objstr.c
index 84728e6f2..9f8da873d 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -123,10 +123,10 @@ STATIC void str_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
bool is_bytes = true;
#endif
if (kind == PRINT_RAW || (!MICROPY_PY_BUILTINS_STR_UNICODE && kind == PRINT_STR && !is_bytes)) {
- mp_printf(print, "%.*s", str_len, str_data);
+ print->print_strn(print->data, (const char *)str_data, str_len);
} else {
if (is_bytes) {
- mp_print_str(print, "b");
+ print->print_strn(print->data, "b", 1);
}
mp_str_print_quoted(print, str_data, str_len, is_bytes);
}