about summary refs log tree commit diff
path: root/misc/Makefile
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:12:23 -0400
commitf2cdbadd8a078482d3b9fc2b59e888c64cc4efae (patch)
treecee1ec32fd3df81ab593a95dd0bb260ed5a88db7 /misc/Makefile
parent978908245b2c0f759100708a9966649f7b273664 (diff)
downloadglibc-f2cdbadd8a078482d3b9fc2b59e888c64cc4efae.tar.gz
glibc-f2cdbadd8a078482d3b9fc2b59e888c64cc4efae.tar.xz
glibc-f2cdbadd8a078482d3b9fc2b59e888c64cc4efae.zip
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.

(cherry picked from commit b0e805fa0d6fea33745952df7b7f5442ca4c374f)
Diffstat (limited to 'misc/Makefile')
-rw-r--r--misc/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/misc/Makefile b/misc/Makefile
index aecb0dae9d..2f5edf6316 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -76,7 +76,8 @@ install-lib := libg.a
 gpl2lgpl := error.c error.h
 
 tests := tst-dirname tst-tsearch tst-fdset tst-efgcvt tst-mntent tst-hsearch \
-	 tst-error1 tst-pselect tst-insremque tst-mntent2 bug-hsearch1
+	 tst-error1 tst-pselect tst-insremque tst-mntent2 bug-hsearch1 \
+	 tst-mntent-blank-corrupt tst-mntent-blank-passno
 ifeq ($(run-built-tests),yes)
 tests-special += $(objpfx)tst-error1-mem.out
 endif