This is the mail archive of the
glibc-bugs@sources.redhat.com
mailing list for the glibc project.
[Bug libc/391] New: getsubopt fixes from gnulib
- From: "eggert at gnu dot org" <sourceware-bugzilla at sources dot redhat dot com>
- To: glibc-bugs at sources dot redhat dot com
- Date: 19 Sep 2004 00:15:57 -0000
- Subject: [Bug libc/391] New: getsubopt fixes from gnulib
- Reply-to: sourceware-bugzilla at sources dot redhat dot com
Can you please install the following patch to getsubopt.c? It is taken from
gnulib. Thanks.
2004-09-18 Paul Eggert <eggert@cs.ucla.edu>
* stdlib/getsubopt.c: Merge fixes from gnulib.
(__strchrnul) [!_LIBC]: Define and include "strchrnul.c".
(getsubopt): Use prototypes, not K&R style.
Fix bug: memcmp(A,B,N) was being invoked on a memory block B
whose size might be smaller than N. Use strncmp to avoid the bug.
--- libc/stdlib/getsubopt.c 2001-07-05 21:55:41 -0700
+++ gnulib/lib/getsubopt.c 2004-08-06 13:23:41 -0700
@@ -1,5 +1,5 @@
/* Parse comma separate list into words.
- Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1999, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -21,6 +21,14 @@
#include <stdlib.h>
#include <string.h>
+#if !_LIBC
+/* This code is written for inclusion in gnu-libc, and uses names in
+ the namespace reserved for libc. If we're compiling in gnulib,
+ define those names to be the normal ones instead. */
+# include "strchrnul.h"
+# undef __strchrnul
+# define __strchrnul strchrnul
+#endif
/* Parse comma separated suboption from *OPTIONP and match against
strings in TOKENS. If found return index and set *VALUEP to
@@ -29,10 +37,7 @@
suboption. On exit *OPTIONP is set to the beginning of the next
token or at the terminating NUL character. */
int
-getsubopt (optionp, tokens, valuep)
- char **optionp;
- char *const *tokens;
- char **valuep;
+getsubopt (char **optionp, char *const *tokens, char **valuep)
{
char *endp, *vstart;
int cnt;
@@ -51,7 +56,7 @@ getsubopt (optionp, tokens, valuep)
/* Try to match the characters between *OPTIONP and VSTART against
one of the TOKENS. */
for (cnt = 0; tokens[cnt] != NULL; ++cnt)
- if (memcmp (*optionp, tokens[cnt], vstart - *optionp) == 0
+ if (strncmp (*optionp, tokens[cnt], vstart - *optionp) == 0
&& tokens[cnt][vstart - *optionp] == '\0')
{
/* We found the current option in TOKENS. */
--
Summary: getsubopt fixes from gnulib
Product: glibc
Version: 2.3.3
Status: NEW
Severity: normal
Priority: P2
Component: libc
AssignedTo: gotom at debian dot or dot jp
ReportedBy: eggert at gnu dot org
CC: glibc-bugs at sources dot redhat dot com
GCC build triplet: any
GCC host triplet: any
GCC target triplet: any
http://sources.redhat.com/bugzilla/show_bug.cgi?id=391
------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.