RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 05:47:35 +00:00
Code Issues Activity Actions

AK: Fix bug where "%s" with field width would print too many characters

Browse source 
I introduced this while implementing "%.*s", oops.
This commit is contained in:
Andreas Kling 2020-02-19 23:01:07 +01:00
parent a87544fe8b
commit 23a54636ea
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
AK/PrintfImplementation.h
View file

@ -28,6 +28,7 @@
#include <AK/Assertions.h> #include <AK/Assertions.h>
#include <AK/LogStream.h> #include <AK/LogStream.h>
#include <AK/StdLibExtras.h>
#include <AK/Types.h> #include <AK/Types.h>
#include <stdarg.h> #include <stdarg.h>
@ -228,20 +229,22 @@ template<typename PutChFunc>
} }
template<typename PutChFunc> template<typename PutChFunc>
[[gnu::always_inline]] inline int print_string(PutChFunc putch, char*& bufptr, const char* str, bool leftPad, u32 field_width, bool dot) [[gnu::always_inline]] inline int print_string(PutChFunc putch, char*& bufptr, const char* str, bool left_pad, size_t field_width, bool dot)
{ {
size_t len = strlen(str); size_t len = strlen(str);
if (!dot && (!field_width || field_width < len)) if (!dot && (!field_width || field_width < len))
field_width = len; field_width = len;
if (!leftPad && field_width > len) { size_t pad_amount = field_width > len ? field_width - len : 0;
for (unsigned i = 0; i < field_width - len; ++i)
if (!left_pad) {
for (size_t i = 0; i < pad_amount; ++i)
putch(bufptr, ' '); putch(bufptr, ' ');
} }
for (unsigned i = 0; i < field_width; ++i) { for (size_t i = 0; i < min(len, field_width); ++i) {
putch(bufptr, str[i]); putch(bufptr, str[i]);
} }
if (leftPad && field_width > len) { if (left_pad) {
for (unsigned i = 0; i < field_width - len; ++i) for (size_t i = 0; i < pad_amount; ++i)
putch(bufptr, ' '); putch(bufptr, ' ');
} }
return field_width; return field_width;