diff options
author | Ondřej Bílka <neleai@seznam.cz> | 2015-07-11 17:44:10 +0200 |
---|---|---|
committer | Ondřej Bílka <neleai@seznam.cz> | 2015-08-25 15:08:23 +0200 |
commit | 2f5c1750558fe64bac361f52d6827ab1bcfe52bc (patch) | |
tree | b7c2c8d0b85b54bf84228e64f805465cc188d25d /misc | |
parent | 0d0325ed4b1052f32069eb3a51f7e16485a73568 (diff) | |
download | glibc-2f5c1750558fe64bac361f52d6827ab1bcfe52bc.tar.gz glibc-2f5c1750558fe64bac361f52d6827ab1bcfe52bc.tar.xz glibc-2f5c1750558fe64bac361f52d6827ab1bcfe52bc.zip |
Handle overflow in __hcreate_r
Hi, As in bugzilla entry there is overflow in hsearch when looking for prime number as SIZE_MAX - 1 is divisible by 5. We fix that by rejecting large inputs before looking for prime. * misc/hsearch_r.c (__hcreate_r): Handle overflow.
Diffstat (limited to 'misc')
-rw-r--r-- | misc/hsearch_r.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/misc/hsearch_r.c b/misc/hsearch_r.c index 9f55e845cf..559df29cf7 100644 --- a/misc/hsearch_r.c +++ b/misc/hsearch_r.c @@ -19,7 +19,7 @@ #include <errno.h> #include <malloc.h> #include <string.h> - +#include <stdint.h> #include <search.h> /* [Aho,Sethi,Ullman] Compilers: Principles, Techniques and Tools, 1986 @@ -73,6 +73,13 @@ __hcreate_r (nel, htab) return 0; } + if (nel >= SIZE_MAX / sizeof (_ENTRY)) + { + __set_errno (ENOMEM); + return 0; + } + + /* There is still another table active. Return with error. */ if (htab->table != NULL) return 0; |