projects
/
gnulib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d796506
)
update from glibc
author
Karl Berry
<karl@freefriends.org>
Sun, 4 Apr 2004 13:32:34 +0000
(13:32 +0000)
committer
Karl Berry
<karl@freefriends.org>
Sun, 4 Apr 2004 13:32:34 +0000
(13:32 +0000)
lib/argp-help.c
patch
|
blob
|
history
diff --git
a/lib/argp-help.c
b/lib/argp-help.c
index
e82f488
..
61acecd
100644
(file)
--- a/
lib/argp-help.c
+++ b/
lib/argp-help.c
@@
-1,5
+1,5
@@
/* Hierarchial argument parsing help output
/* Hierarchial argument parsing help output
- Copyright (C) 1995-200
0, 2001, 2002, 2003
Free Software Foundation, Inc.
+ Copyright (C) 1995-200
3, 2004
Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
@@
-46,6
+46,7
@@
char *alloca ();
#include <assert.h>
#include <stdarg.h>
#include <ctype.h>
#include <assert.h>
#include <stdarg.h>
#include <ctype.h>
+#include <limits.h>
#ifdef USE_IN_LIBIO
# include <wchar.h>
#endif
#ifdef USE_IN_LIBIO
# include <wchar.h>
#endif
@@
-451,8
+452,10
@@
make_hol (const struct argp *argp, struct hol_cluster *cluster)
hol->entries = malloc (sizeof (struct hol_entry) * hol->num_entries);
hol->short_options = malloc (num_short_options + 1);
hol->entries = malloc (sizeof (struct hol_entry) * hol->num_entries);
hol->short_options = malloc (num_short_options + 1);
- assert (hol->entries && hol->short_options
- && hol->num_entries <= SIZE_MAX / sizeof (struct hol_entry));
+ assert (hol->entries && hol->short_options);
+#if SIZE_MAX <= UINT_MAX
+ assert (hol->num_entries <= SIZE_MAX / sizeof (struct hol_entry));
+#endif
/* Fill in the entries. */
so = hol->short_options;
/* Fill in the entries. */
so = hol->short_options;
@@
-845,8
+848,10
@@
hol_append (struct hol *hol, struct hol *more)
char *short_options =
malloc (hol_so_len + strlen (more->short_options) + 1);
char *short_options =
malloc (hol_so_len + strlen (more->short_options) + 1);
- assert (entries && short_options
- && num_entries <= SIZE_MAX / sizeof (struct hol_entry));
+ assert (entries && short_options);
+#if SIZE_MAX <= UINT_MAX
+ assert (num_entries <= SIZE_MAX / sizeof (struct hol_entry));
+#endif
__mempcpy (__mempcpy (entries, hol->entries,
hol->num_entries * sizeof (struct hol_entry)),
__mempcpy (__mempcpy (entries, hol->entries,
hol->num_entries * sizeof (struct hol_entry)),