Mercurial > gnulib
changeset 9558:c487592d112a
Protect against integer overflow in malloca() calls.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Mon, 31 Dec 2007 11:53:40 +0100 |
| parents | 81a0ee2e4e00 |
| children | 7913bdfb0cf8 |
| files | ChangeLog lib/c-strcasestr.c lib/c-strstr.c lib/malloca.h lib/mbscasestr.c lib/mbsstr.c lib/memmem.c lib/strcasestr.c |
| diffstat | 8 files changed, 33 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Dec 31 11:51:57 2007 +0100 +++ b/ChangeLog Mon Dec 31 11:53:40 2007 +0100 @@ -1,3 +1,15 @@ +2007-12-30 Bruno Haible <bruno@clisp.org> + + * lib/malloca.h (nmalloca): New macro. + * lib/c-strcasestr.c (knuth_morris_pratt): Use it. + * lib/c-strstr.c (knuth_morris_pratt): Likewise. + * lib/mbscasestr.c (knuth_morris_pratt_unibyte, + knuth_morris_pratt_multibyte): Likewise. + * lib/mbsstr.c (knuth_morris_pratt_unibyte, + knuth_morris_pratt_multibyte): Likewise. + * lib/memmem.c (knuth_morris_pratt): Likewise. + * lib/strcasestr.c (knuth_morris_pratt): Likewise. + 2007-12-25 Bruno Haible <bruno@clisp.org> Fixup after 2007-10-17 commit. Ensure that 'glob' stays under LGPLv2+.
--- a/lib/c-strcasestr.c Mon Dec 31 11:51:57 2007 +0100 +++ b/lib/c-strcasestr.c Mon Dec 31 11:53:40 2007 +0100 @@ -37,7 +37,7 @@ size_t m = strlen (needle); /* Allocate the table. */ - size_t *table = (size_t *) malloca (m * sizeof (size_t)); + size_t *table = (size_t *) nmalloca (m, sizeof (size_t)); if (table == NULL) return false; /* Fill the table.
--- a/lib/c-strstr.c Mon Dec 31 11:51:57 2007 +0100 +++ b/lib/c-strstr.c Mon Dec 31 11:53:40 2007 +0100 @@ -36,7 +36,7 @@ size_t m = strlen (needle); /* Allocate the table. */ - size_t *table = (size_t *) malloca (m * sizeof (size_t)); + size_t *table = (size_t *) nmalloca (m, sizeof (size_t)); if (table == NULL) return false; /* Fill the table.
--- a/lib/malloca.h Mon Dec 31 11:51:57 2007 +0100 +++ b/lib/malloca.h Mon Dec 31 11:53:40 2007 +0100 @@ -70,9 +70,19 @@ # define freea free #endif -/* Maybe we should also define a variant - nmalloca (size_t n, size_t s) - behaves like malloca (n * s) - If this would be useful in your application. please speak up. */ +/* nmalloca(N,S) is an overflow-safe variant of malloca (N * S). + It allocates an array of N objects, each with S bytes of memory, + on the stack. S must be positive and N must be nonnegative. + The array must be freed using freea() before the function returns. */ +#if 1 +/* Cf. the definition of xalloc_oversized. */ +# define nmalloca(n, s) \ + ((n) > (size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) \ + ? NULL \ + : malloca ((n) * (s))) +#else +extern void * nmalloca (size_t n, size_t s); +#endif #ifdef __cplusplus
--- a/lib/mbscasestr.c Mon Dec 31 11:51:57 2007 +0100 +++ b/lib/mbscasestr.c Mon Dec 31 11:53:40 2007 +0100 @@ -42,7 +42,7 @@ size_t m = strlen (needle); /* Allocate the table. */ - size_t *table = (size_t *) malloca (m * sizeof (size_t)); + size_t *table = (size_t *) nmalloca (m, sizeof (size_t)); if (table == NULL) return false; /* Fill the table. @@ -164,7 +164,7 @@ size_t *table; /* Allocate room for needle_mbchars and the table. */ - char *memory = (char *) malloca (m * (sizeof (mbchar_t) + sizeof (size_t))); + char *memory = (char *) nmalloca (m, sizeof (mbchar_t) + sizeof (size_t)); if (memory == NULL) return false; needle_mbchars = (mbchar_t *) memory;
--- a/lib/mbsstr.c Mon Dec 31 11:51:57 2007 +0100 +++ b/lib/mbsstr.c Mon Dec 31 11:53:40 2007 +0100 @@ -39,7 +39,7 @@ size_t m = strlen (needle); /* Allocate the table. */ - size_t *table = (size_t *) malloca (m * sizeof (size_t)); + size_t *table = (size_t *) nmalloca (m, sizeof (size_t)); if (table == NULL) return false; /* Fill the table. @@ -160,7 +160,7 @@ size_t *table; /* Allocate room for needle_mbchars and the table. */ - char *memory = (char *) malloca (m * (sizeof (mbchar_t) + sizeof (size_t))); + char *memory = (char *) nmalloca (m, sizeof (mbchar_t) + sizeof (size_t)); if (memory == NULL) return false; needle_mbchars = (mbchar_t *) memory;
--- a/lib/memmem.c Mon Dec 31 11:51:57 2007 +0100 +++ b/lib/memmem.c Mon Dec 31 11:53:40 2007 +0100 @@ -39,10 +39,7 @@ const char **resultp) { /* Allocate the table. */ - size_t *table; - if ((size_t) -1 / sizeof (size_t) < m) - return false; - table = (size_t *) malloca (m * sizeof (size_t)); + size_t *table = (size_t *) nmalloca (m, sizeof (size_t)); if (table == NULL) return false; /* Fill the table.
--- a/lib/strcasestr.c Mon Dec 31 11:51:57 2007 +0100 +++ b/lib/strcasestr.c Mon Dec 31 11:53:40 2007 +0100 @@ -39,7 +39,7 @@ size_t m = strlen (needle); /* Allocate the table. */ - size_t *table = (size_t *) malloca (m * sizeof (size_t)); + size_t *table = (size_t *) nmalloca (m, sizeof (size_t)); if (table == NULL) return false; /* Fill the table.