fef/libneo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

string: fix off-by-one error in leftpad

Browse source
This commit is contained in:
anna 2021-07-15 23:00:17 +02:00
parent 900bce9b8e
commit 7d64438f70
Signed by: fef
GPG key ID: EC22E476DC2D3D84
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/string/leftpad.c
View file

@ -19,7 +19,13 @@ static inline string *leftpad_unsafe(const string *s, usize len, nchar fillchr,
} }
usize extra_chars = len - s->_len; usize extra_chars = len - s->_len;
usize size_now = s->_capacity + 1; /*
* This is actually three bytes larger than the actual size because neo
* strings are terminated with four NUL characters rather than just one,
* but that's okay because if we don't even have enough memory for three
* extra bytes we are screwed anyway.
*/
usize size_now = s->_capacity;
usize size_after = size_now + (extra_chars * fillchr_size); usize size_after = size_now + (extra_chars * fillchr_size);
char *dest = nalloc(size_after, err); char *dest = nalloc(size_after, err);
catch(err) { catch(err) {
@ -50,10 +56,10 @@ string *leftpad(const string *s, usize len, nchar fillchr, error *err)
string *padded; string *padded;
if (len < s->_len) { if (len < nlen(s)) {
yeet(err, ERANGE, "String is longer than requested length"); yeet(err, ERANGE, "String is longer than requested length");
padded = nil; padded = nil;
} else if (s->_len == len) { } else if (nlen(s) == len) {
padded = nstrdup(s, err); padded = nstrdup(s, err);
} else { } else {
padded = leftpad_unsafe(s, len, fillchr, err); padded = leftpad_unsafe(s, len, fillchr, err);