isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

getdelim_test: increase longstr to check end pointer after realloc

Browse Source 
This would have caught the recent bug in our getdelim replacement
when run under address-sanitizer or valgrind.
This commit is contained in:
Todd C. Miller
2022-03-11 09:03:55 -07:00
parent 8e7c004c7f
commit b2a32f95ee
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/util/regress/getdelim/getdelim_test.c
View File

@@ -38,6 +38,8 @@
sudo_dso_public int main(int argc, char *argv[]); sudo_dso_public int main(int argc, char *argv[]);
ssize_t sudo_getdelim(char **bufp, size_t *bufsizep, int delim, FILE *fp);
/* /*
* Test that sudo_getdelim() works as expected. * Test that sudo_getdelim() works as expected.
*/ */
@@ -48,7 +50,7 @@ struct getdelim_test {
int delim; int delim;
}; };
static char longstr[LINE_MAX * 2]; static char longstr[LINE_MAX * 4];
static struct getdelim_test test_data[] = { static struct getdelim_test test_data[] = {
{ "a\nb\nc\n", { "a\n", "b\n", "c\n", NULL }, '\n' }, { "a\nb\nc\n", { "a\n", "b\n", "c\n", NULL }, '\n' },
{ "a\nb\nc", { "a\n", "b\n", "c", NULL }, '\n' }, { "a\nb\nc", { "a\n", "b\n", "c", NULL }, '\n' },
@@ -100,8 +102,8 @@ runtests(char **buf, size_t *buflen)
for (j = 0; test_data[i].output[j] != NULL; j++) { for (j = 0; test_data[i].output[j] != NULL; j++) {
ntests++; ntests++;
alarm(10); alarm(10);
if (getdelim(buf, buflen, test_data[i].delim, fp) == -1) if (sudo_getdelim(buf, buflen, test_data[i].delim, fp) == -1)
sudo_fatal_nodebug("getdelim"); sudo_fatal_nodebug("sudo_getdelim");
alarm(0); alarm(0);
if (strcmp(*buf, test_data[i].output[j]) != 0) { if (strcmp(*buf, test_data[i].output[j]) != 0) {
sudo_warnx_nodebug("failed test #%d: expected %s, got %s", sudo_warnx_nodebug("failed test #%d: expected %s, got %s",
@@ -113,7 +115,7 @@ runtests(char **buf, size_t *buflen)
/* test EOF */ /* test EOF */
ntests++; ntests++;
alarm(30); alarm(30);
if (getdelim(buf, buflen, test_data[i].delim, fp) != -1) { if (sudo_getdelim(buf, buflen, test_data[i].delim, fp) != -1) {
sudo_warnx_nodebug("failed test #%d: expected EOF, got %s", sudo_warnx_nodebug("failed test #%d: expected EOF, got %s",
ntests, *buf); ntests, *buf);
errors++; errors++;
@@ -130,7 +132,7 @@ runtests(char **buf, size_t *buflen)
close(fileno(fp)); close(fileno(fp));
ntests++; ntests++;
alarm(30); alarm(30);
if (getdelim(buf, buflen, test_data[i].delim, fp) != -1) { if (sudo_getdelim(buf, buflen, test_data[i].delim, fp) != -1) {
sudo_warnx_nodebug("failed test #%d: expected error, got %s", sudo_warnx_nodebug("failed test #%d: expected error, got %s",
ntests, *buf); ntests, *buf);
errors++; errors++;
@@ -172,6 +174,7 @@ main(int argc, char *argv[])
argv += optind; argv += optind;
runtests(&buf, &buflen); runtests(&buf, &buflen);
free(buf);
/* XXX - redo tests with preallocated buffer filled with junk */ /* XXX - redo tests with preallocated buffer filled with junk */
if (ntests != 0) { if (ntests != 0) {