qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix handling if newline in addmntent.

This commit is contained in:
Ulrich Drepper 2010-05-02 12:12:55 -07:00
parent 8c0677fe5d
commit ab00f4eac8
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2010-05-02 Ulrich Drepper <drepper@redhat.com>
* misc/mntent_r.c (encode_name): The slow loop handles newlines so we
should recognize them as an abort condition.
Patch by Jan Lieskovsky <jlieskov@redhat.com>.
2010-04-25 Bruno Haible <bruno@clisp.org> 2010-04-25 Bruno Haible <bruno@clisp.org>
[BZ #11538] [BZ #11538]

6
misc/mntent_r.c
View File

@ -1,5 +1,5 @@
/* Utilities for reading/writing fstab, mtab, etc. /* Utilities for reading/writing fstab, mtab, etc.
Copyright (C) 1995-2000, 2001, 2002, 2003, 2006 Copyright (C) 1995-2000, 2001, 2002, 2003, 2006, 2010
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -194,7 +194,7 @@ weak_alias (__getmntent_r, getmntent_r)
const char *rp = name; \ const char *rp = name; \
\ \
while (*rp != '\0') \ while (*rp != '\0') \
if (*rp == ' ' || *rp == '\t' || *rp == '\\') \ if (*rp == ' ' || *rp == '\t' || *rp == '\n' || *rp == '\\') \
break; \ break; \
else \ else \
++rp; \ ++rp; \
@ -202,7 +202,7 @@ weak_alias (__getmntent_r, getmntent_r)
if (*rp != '\0') \ if (*rp != '\0') \
{ \ { \
/* In the worst case the length of the string can increase to \ /* In the worst case the length of the string can increase to \
founr times the current length. */ \ four times the current length. */ \
char *wp; \ char *wp; \
\ \
rp = name; \ rp = name; \