upstream/knot-dns
1
0
Fork 0
mirror of https://gitlab.nic.cz/knot/knot-dns.git synced 2026-05-28 04:02:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

zscanner: bugfix: buffering from pipe

Browse source
This commit is contained in:
Libor Peltan 2025-04-09 10:10:26 +02:00
parent c8b8e00bbc
commit 3cc6da022b
3 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libzscanner/scanner.c.g2
View file

@ -227,8 +227,12 @@ static char *read_file_to_buf(
char *buf = malloc(bufs + newbufs);
int ret = 0;
while (buf != NULL && (ret = read(fd, buf + bufs, newbufs)) == newbufs) {
bufs += newbufs;
while (buf != NULL && (ret = read(fd, buf + bufs, newbufs)) > 0) {
bufs += ret;
if (ret < newbufs) {
newbufs -= ret;
continue;
}
newbufs = bufs;
char *newbuf = realloc(buf, bufs + newbufs);
if (newbuf == NULL) {

8
src/libzscanner/scanner.c.t0
View file

@ -6622,8 +6622,12 @@ static char *read_file_to_buf(
char *buf = malloc(bufs + newbufs);
int ret = 0;
while (buf != NULL && (ret = read(fd, buf + bufs, newbufs)) == newbufs) {
bufs += newbufs;
while (buf != NULL && (ret = read(fd, buf + bufs, newbufs)) > 0) {
bufs += ret;
if (ret < newbufs) {
newbufs -= ret;
continue;
}
newbufs = bufs;
char *newbuf = realloc(buf, bufs + newbufs);
if (newbuf == NULL) {

8
src/libzscanner/scanner.rl
View file

@ -228,8 +228,12 @@ static char *read_file_to_buf(
char *buf = malloc(bufs + newbufs);
int ret = 0;
while (buf != NULL && (ret = read(fd, buf + bufs, newbufs)) == newbufs) {
bufs += newbufs;
while (buf != NULL && (ret = read(fd, buf + bufs, newbufs)) > 0) {
bufs += ret;
if (ret < newbufs) {
newbufs -= ret;
continue;
}
newbufs = bufs;
char *newbuf = realloc(buf, bufs + newbufs);
if (newbuf == NULL) {