Mercurial > hg > octave-kai > gnulib-hg
diff lib/argp-help.c @ 4736:60f76c3e517a
updates from libc,automake
| author | Karl Berry <karl@freefriends.org> |
|---|---|
| date | Thu, 25 Sep 2003 12:21:19 +0000 |
| parents | 3358eb550c86 |
| children | 0a9cf348c2ec |
line wrap: on
line diff
--- a/lib/argp-help.c +++ b/lib/argp-help.c @@ -72,6 +72,10 @@ #include "argp.h" #include "argp-fmtstream.h" #include "argp-namefrob.h" + +#ifndef SIZE_MAX +# define SIZE_MAX ((size_t) -1) +#endif /* User-selectable (using an environment variable) formatting parameters. @@ -440,7 +444,8 @@ hol->entries = malloc (sizeof (struct hol_entry) * hol->num_entries); hol->short_options = malloc (num_short_options + 1); - assert (hol->entries && hol->short_options); + assert (hol->entries && hol->short_options + && hol->num_entries <= SIZE_MAX / sizeof (struct hol_entry)); /* Fill in the entries. */ so = hol->short_options; @@ -833,6 +838,9 @@ char *short_options = malloc (hol_so_len + strlen (more->short_options) + 1); + assert (entries && short_options + && num_entries <= SIZE_MAX / sizeof (struct hol_entry)); + __mempcpy (__mempcpy (entries, hol->entries, hol->num_entries * sizeof (struct hol_entry)), more->entries,