nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-06 22:12:47 -05:00
Code Issues Projects Releases Wiki Activity

New functions to shrink a strbuf.

Browse Source 
These are better than my previous approach of just assigning to
sb->len, because firstly they check by assertion that the new length
is within range, and secondly they preserve the invariant that the
byte stored in the buffer just after the length runs out is \0.

Switched to using the new functions everywhere a grep could turn up
opportunities.
This commit is contained in:
Simon Tatham
2020-01-21 20:16:28 +00:00
parent 88d5948ead
commit 5891142aee
17 changed files with 45 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
terminal.c
View File

@ -440,11 +440,11 @@ static void makerle(strbuf *b, termline *ldata,
if (hdrsize == 0) {
assert(prevpos == hdrpos + 1);
runpos = hdrpos;
b->len = prevpos+prevlen;
strbuf_shrink_to(b, prevpos+prevlen);
} else {
memmove(b->u + prevpos+1, b->u + prevpos, prevlen);
runpos = prevpos;
b->len = prevpos+prevlen+1;
strbuf_shrink_to(b, prevpos+prevlen+1);
/*
* Terminate the previous run of ordinary
* literals.
@ -461,7 +461,7 @@ static void makerle(strbuf *b, termline *ldata,
oldstate = state;
makeliteral(b, c, &state);
tmplen = b->len - tmppos;
b->len = tmppos;
strbuf_shrink_to(b, tmppos);
if (tmplen != thislen ||
memcmp(b->u + runpos+1, b->u + tmppos, tmplen)) {
state = oldstate;
@ -519,7 +519,7 @@ static void makerle(strbuf *b, termline *ldata,
assert(hdrsize <= 128);
b->u[hdrpos] = hdrsize - 1;
} else {
b->len = hdrpos;
strbuf_shrink_to(b, hdrpos);
}
}
static void makeliteral_chr(strbuf *b, termchar *c, unsigned long *state)
@ -3057,7 +3057,7 @@ static strbuf *term_input_data_from_unicode(
int rv;
rv = wc_to_mb(term->ucsdata->line_codepage, 0, widebuf, len,
bufptr, len + 1, NULL, term->ucsdata);
buf->len = rv < 0 ? 0 : rv;
strbuf_shrink_to(buf, rv < 0 ? 0 : rv);
}
return buf;