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

py: Fix bug in vstr_ins_blank_bytes.

Browse Source
This commit is contained in:
Damien George 2014-03-15 16:54:06 +00:00
parent 6c2455f481
commit ecd58aec08
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
py/vstr.c
View File

@ -227,11 +227,10 @@ char *vstr_ins_blank_bytes(vstr_t *vstr, uint byte_pos, uint byte_len) {
if (!vstr_ensure_extra(vstr, byte_len)) { if (!vstr_ensure_extra(vstr, byte_len)) {
return NULL; return NULL;
} }
// copy up the string to make room for the new bytes // copy up the string to make room for the new bytes; +1 for the null byte
memmove(vstr->buf + l - 1 + byte_len, vstr->buf + l - 1, l - byte_pos); memmove(vstr->buf + byte_pos + byte_len, vstr->buf + byte_pos, l - byte_pos + 1);
// increase the length // increase the length
vstr->len += byte_len; vstr->len += byte_len;
vstr->buf[vstr->len] = 0;
} }
return vstr->buf + byte_pos; return vstr->buf + byte_pos;
} }
@ -243,9 +242,9 @@ void vstr_ins_byte(vstr_t *vstr, uint byte_pos, byte b) {
} }
} }
void vstr_ins_char(vstr_t *vstr, uint pos, unichar chr) { void vstr_ins_char(vstr_t *vstr, uint char_pos, unichar chr) {
// TODO UNICODE // TODO UNICODE
char *s = vstr_ins_blank_bytes(vstr, pos, 1); char *s = vstr_ins_blank_bytes(vstr, char_pos, 1);
if (s != NULL) { if (s != NULL) {
*s = chr; *s = chr;
} }