Fix memory handling in strxfrm_l [BZ #16009]

[platform/upstream/glibc.git] / string / argz-extract.c

diff --git a/string/argz-extract.c b/string/argz-extract.c
index 5eb0e84..757146b 100644 (file)
--- a/string/argz-extract.c
+++ b/string/argz-extract.c
@@ -1,36 +1,36 @@
 /* Routines for dealing with '\0' separated arg vectors.
+   Copyright (C) 1995-2015 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Written by Miles Bader <miles@gnu.org>
 
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   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.
 
-   Written by Miles Bader <miles@gnu.ai.mit.edu>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2, or (at
-   your option) any later version.
-
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
+   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
-   General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+   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 <argz.h>
 
-/* Puts pointers to each string in ARGZ into ARGV, which must be large enough
-   to hold them all.  */
+/* Puts pointers to each string in ARGZ, plus a terminating 0 element, into
+   ARGV, which must be large enough to hold them all.  */
 void
 __argz_extract (const char *argz, size_t len, char **argv)
 {
   while (len > 0)
     {
-      size_t part_len = strlen(argz);
-      *argv++ = argz;
+      size_t part_len = strlen (argz);
+      *argv++ = (char *) argz;
       argz += part_len + 1;
       len -= part_len + 1;
     }
+  *argv = 0;
 }
 weak_alias (__argz_extract, argz_extract)