mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
b0e805fa0d
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.
54 lines
1.6 KiB
C
54 lines
1.6 KiB
C
/* Make sure trailing whitespace is handled properly BZ #17273.
|
|
|
|
Copyright (C) 2009-2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <mntent.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
/* Check entries to make sure trailing whitespace is ignored and we return the
|
|
correct passno value BZ #17273. */
|
|
static int
|
|
do_test (void)
|
|
{
|
|
int result = 0;
|
|
FILE *fp;
|
|
struct mntent *mnt;
|
|
|
|
fp = tmpfile ();
|
|
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;
|
|
}
|
|
|
|
#define TEST_FUNCTION do_test ()
|
|
#include "../test-skeleton.c"
|