aboutsummaryrefslogtreecommitdiff
path: root/misc/tst-mntent.c
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-08-28 17:08:49 -0400
committerMike Frysinger <vapier@gentoo.org>2015-08-29 18:07:00 -0400
commitb0e805fa0d6fea33745952df7b7f5442ca4c374f (patch)
tree1912c70048e9a9a4a48681f37d0dd692265cd693 /misc/tst-mntent.c
parent30da407eca459329e060d0412c3fa6710f657e83 (diff)
downloadglibc-b0e805fa0d6fea33745952df7b7f5442ca4c374f.zip
glibc-b0e805fa0d6fea33745952df7b7f5442ca4c374f.tar.gz
glibc-b0e805fa0d6fea33745952df7b7f5442ca4c374f.tar.bz2
getmntent: fix memory corruption w/blank lines [BZ #18887]
The fix for BZ #17273 introduced a single byte of memory corruption when the line is entirely blank. It would walk back past the start of the buffer if the heap happened to be 0x20 or 0x09 and then write a NUL byte. buffer = '\n'; end_ptr = buffer; while (end_ptr[-1] == ' ' || end_ptr[-1] == '\t') end_ptr--; *end_ptr = '\0'; Fix that and rework the tests. Adding the testcase for BZ #17273 to the existing \040 parser does not really make sense as it's unrelated, and leads to confusing behavior: it implicitly relies on the new entry being longer than the previous entry (since it just rewinds the FILE*). Split it out into its own dedicated testcase instead.
Diffstat (limited to 'misc/tst-mntent.c')
-rw-r--r--misc/tst-mntent.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/misc/tst-mntent.c b/misc/tst-mntent.c
index 932fd3f..b6ad8af 100644
--- a/misc/tst-mntent.c
+++ b/misc/tst-mntent.c
@@ -73,26 +73,6 @@ do_test (void)
puts ("Error while reading written entry back in");
result = 1;
}
-
- /* Part III: Entry with whitespaces at the end of a line. */
- rewind (fp);
-
- fputs ("/foo\\040dir /bar\\040dir auto bind \t \n", fp);
-
- rewind (fp);
-
- mnt = getmntent (fp);
-
- if (strcmp (mnt->mnt_fsname, "/foo dir") != 0
- || strcmp (mnt->mnt_dir, "/bar dir") != 0
- || strcmp (mnt->mnt_type, "auto") != 0
- || strcmp (mnt->mnt_opts, "bind") != 0
- || mnt->mnt_freq != 0
- || mnt->mnt_passno != 0)
- {
- puts ("Error while reading entry with trailing whitespaces");
- result = 1;
- }
}
return result;