djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py/vstr: vstr_null_terminated_str(): Extend string by at most one byte.

Browse Source 
vstr_null_terminated_str is almost certainly a vstr finalization operation,
so it should add the requested NUL byte, and not try to pre-allocate more.
The previous implementation could actually allocate double of the buffer
size.
This commit is contained in:
Paul Sokolovsky 2016-05-09 22:39:57 +03:00
parent 6de8dbb488
commit a1f2245a81
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
py/vstr.c
View File

@ -181,9 +181,15 @@ char *vstr_add_len(vstr_t *vstr, size_t len) {
// Doesn't increase len, just makes sure there is a null byte at the end // Doesn't increase len, just makes sure there is a null byte at the end
char *vstr_null_terminated_str(vstr_t *vstr) { char *vstr_null_terminated_str(vstr_t *vstr) {
if (vstr->had_error || !vstr_ensure_extra(vstr, 1)) { if (vstr->had_error) {
return NULL; return NULL;
} }
// If there's no more room, add single byte
if (vstr->alloc == vstr->len) {
if (vstr_extend(vstr, 1) == NULL) {
return NULL;
}
}
vstr->buf[vstr->len] = '\0'; vstr->buf[vstr->len] = '\0';
return vstr->buf; return vstr->buf;
} }