public inbox for glibc-bugs@sourceware.org
help / color / mirror / Atom feed
* [Bug libc/391] New: getsubopt fixes from gnulib
@ 2004-09-19 0:15 eggert at gnu dot org
2004-09-20 20:56 ` [Bug libc/391] " cvs-commit at gcc dot gnu dot org
2004-09-20 21:04 ` roland at gnu dot org
0 siblings, 2 replies; 3+ messages in thread
From: eggert at gnu dot org @ 2004-09-19 0:15 UTC (permalink / raw)
To: glibc-bugs
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Bug libc/391] getsubopt fixes from gnulib
2004-09-19 0:15 [Bug libc/391] New: getsubopt fixes from gnulib eggert at gnu dot org
@ 2004-09-20 20:56 ` cvs-commit at gcc dot gnu dot org
2004-09-20 21:04 ` roland at gnu dot org
1 sibling, 0 replies; 3+ messages in thread
From: cvs-commit at gcc dot gnu dot org @ 2004-09-20 20:56 UTC (permalink / raw)
To: glibc-bugs
------- Additional Comments From cvs-commit at gcc dot gnu dot org 2004-09-20 20:56 -------
Subject: Bug 391
CVSROOT: /cvs/glibc
Module name: libc
Changes by: roland@sources.redhat.com 2004-09-20 20:56:05
Modified files:
stdlib : getsubopt.c
Log message:
2004-09-18 Paul Eggert <eggert@cs.ucla.edu>
[BZ #391]
* 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.
Patches:
http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/stdlib/getsubopt.c.diff?cvsroot=glibc&r1=1.6&r2=1.7
--
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Bug libc/391] getsubopt fixes from gnulib
2004-09-19 0:15 [Bug libc/391] New: getsubopt fixes from gnulib eggert at gnu dot org
2004-09-20 20:56 ` [Bug libc/391] " cvs-commit at gcc dot gnu dot org
@ 2004-09-20 21:04 ` roland at gnu dot org
1 sibling, 0 replies; 3+ messages in thread
From: roland at gnu dot org @ 2004-09-20 21:04 UTC (permalink / raw)
To: glibc-bugs
------- Additional Comments From roland at gnu dot org 2004-09-20 21:04 -------
Done.
--
What |Removed |Added
----------------------------------------------------------------------------
Status|NEW |RESOLVED
Resolution| |FIXED
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2004-09-20 21:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-09-19 0:15 [Bug libc/391] New: getsubopt fixes from gnulib eggert at gnu dot org
2004-09-20 20:56 ` [Bug libc/391] " cvs-commit at gcc dot gnu dot org
2004-09-20 21:04 ` roland at gnu dot org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).