Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When reading output from a program we don't know how much it will 

be - so scale the buffer (within reasonable limits).
Problem pointed out by RVP, triggered e.g. by disks with lots of GPT
partitions.
This commit is contained in:
martin 2021-08-03 13:34:04 +00:00
parent c7885d2832
commit 71830ed8c3
1 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
usr.sbin/sysinst/run.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: run.c,v 1.13 2019/11/16 20:26:59 martin Exp $ */
/* $NetBSD: run.c,v 1.14 2021/08/03 13:34:04 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -176,6 +176,7 @@ collect(int kind, char **buffer, const char *name, ...)
{
size_t nbytes; /* Number of bytes in buffer. */
size_t fbytes; /* Number of bytes in file. */
size_t abytes; /* allocated size of buffer */
struct stat st; /* stat information. */
int ch;
FILE *f;
@ -198,6 +199,9 @@ collect(int kind, char **buffer, const char *name, ...)
/* Open the file. */
f = fopen(fileorcmd, "r");
if (f == NULL) {
if (logfp)
fprintf(logfp, "%s: failed to open %s\n",
__func__, fileorcmd);
*buffer = NULL;
return -1;
}
@ -205,25 +209,47 @@ collect(int kind, char **buffer, const char *name, ...)
/* Open the program. */
f = popen(fileorcmd, "r");
if (f == NULL) {
if (logfp)
fprintf(logfp, "%s: failed to open %s\n",
__func__, fileorcmd);
*buffer = NULL;
return -1;
}
fbytes = BUFSIZE;
fbytes = 0;
}
if (fbytes == 0)
fbytes = BUFSIZE;
abytes = BUFSIZE;
else
abytes = fbytes+1;
/* Allocate the buffer size. */
*buffer = cp = malloc(fbytes + 1);
*buffer = cp = malloc(abytes);
if (!cp)
nbytes = -1;
else {
/* Read the buffer. */
nbytes = 0;
while (nbytes < fbytes && (ch = fgetc(f)) != EOF)
while ((ch = fgetc(f)) != EOF) {
if (nbytes >= abytes-1) {
if (fbytes > 0 || abytes >= 512*BUFSIZE) {
free(cp);
*buffer = cp = NULL;
nbytes = -1;
break;
}
abytes *= 2;
*buffer = cp = realloc(cp, abytes);
if (!cp) {
nbytes = -1;
break;
}
}
cp[nbytes++] = ch;
cp[nbytes] = 0;
}
if (cp)
cp[nbytes] = 0;
}
if (kind == T_FILE)
@ -231,6 +257,9 @@ collect(int kind, char **buffer, const char *name, ...)
else
pclose(f);
if (nbytes <= 0 && logfp)
fprintf(logfp, "%s: failed for %s\n", __func__, fileorcmd);
return nbytes;
}