Fix handling if newline in addmntent.

diff --git a/ChangeLog b/ChangeLog
index e5bf7da..60adfb8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        [BZ #11538]

diff --git a/misc/mntent_r.c b/misc/mntent_r.c
index 829750b..9598528 100644 (file)
--- a/misc/mntent_r.c
+++ b/misc/mntent_r.c
@@ -1,5 +1,5 @@
 /* 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.
    This file is part of the GNU C Library.
 
@@ -194,7 +194,7 @@ weak_alias (__getmntent_r, getmntent_r)
     const char *rp = name;                                                   \
                                                                              \
     while (*rp != '\0')                                                              \
-      if (*rp == ' ' || *rp == '\t' || *rp == '\\')                          \
+      if (*rp == ' ' || *rp == '\t' || *rp == '\n' || *rp == '\\')           \
        break;                                                                \
       else                                                                   \
        ++rp;                                                                 \
@@ -202,7 +202,7 @@ weak_alias (__getmntent_r, getmntent_r)
     if (*rp != '\0')                                                         \
       {                                                                              \
        /* In the worst case the length of the string can increase to         \
-          founr times the current length.  */                                \
+          four times the current length.  */                                 \
        char *wp;                                                             \
                                                                              \
        rp = name;                                                            \