mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-07 11:41:16 +02:00
Code Releases Activity

43156, 43157: Need to allow for extra space in gethere().

Browse source 
The point can now increment twice per iteration.
This commit is contained in:
Peter Stephenson 2018-07-10 14:42:02 +01:00
parent 17178db1a4
commit 3e9fc32fc3
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2018-07-10 Peter Stephenson <p.stephenson@samsung.com>
* 43156, 43157: Src/exec.c: need to allow for possible
update of pointer by two in gethere().
2018-07-09 Peter Stephenson <p.stephenson@samsung.com> 2018-07-09 Peter Stephenson <p.stephenson@samsung.com>
* users/23531: Src/exec.c, Test/C03traps.ztst: Fix error * users/23531: Src/exec.c, Test/C03traps.ztst: Fix error

8
Src/exec.c
View file

@ -4418,7 +4418,9 @@ gethere(char **strp, int typ)
while ((c = hgetc()) == '\t' && strip) while ((c = hgetc()) == '\t' && strip)
; ;
for (;;) { for (;;) {
if (bptr == buf + bsiz) { if (bptr >= buf + bsiz - 2) {
ptrdiff_t toff = t - buf;
ptrdiff_t bptroff = bptr - buf;
char *newbuf = realloc(buf, 2 * bsiz); char *newbuf = realloc(buf, 2 * bsiz);
if (!newbuf) { if (!newbuf) {
/* out of memory */ /* out of memory */
@ -4426,8 +4428,8 @@ gethere(char **strp, int typ)
return NULL; return NULL;
} }
buf = newbuf; buf = newbuf;
t = buf + bsiz - (bptr - t); t = buf + toff;
bptr = buf + bsiz; bptr = buf + bptroff;
bsiz *= 2; bsiz *= 2;
} }
if (lexstop || c == '\n') if (lexstop || c == '\n')