diff options
author | jilles <jilles@FreeBSD.org> | 2015-08-15 19:58:00 +0000 |
---|---|---|
committer | jilles <jilles@FreeBSD.org> | 2015-08-15 19:58:00 +0000 |
commit | aa479658a049405386de079557d4fa41c437ce0b (patch) | |
tree | dd5862d98503bfa59b68194f4aa8a661be0b2e4e /bin/sh/exec.c | |
parent | a91e3ef58a004aace2995a6dec20856019ce1c7d (diff) | |
download | FreeBSD-src-aa479658a049405386de079557d4fa41c437ce0b.zip FreeBSD-src-aa479658a049405386de079557d4fa41c437ce0b.tar.gz |
MFC r284779: sh: Fix some arithmetic undefined behaviour.
Fix shifts of possibly negative numbers found with ubsan and avoid signed
integer overflow when hashing an extremely long command name.
Diffstat (limited to 'bin/sh/exec.c')
-rw-r--r-- | bin/sh/exec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bin/sh/exec.c b/bin/sh/exec.c index e547e31..d245b55 100644 --- a/bin/sh/exec.c +++ b/bin/sh/exec.c @@ -524,17 +524,16 @@ static struct tblentry **lastcmdentry; static struct tblentry * cmdlookup(const char *name, int add) { - int hashval; + unsigned int hashval; const char *p; struct tblentry *cmdp; struct tblentry **pp; size_t len; p = name; - hashval = *p << 4; + hashval = (unsigned char)*p << 4; while (*p) hashval += *p++; - hashval &= 0x7FFF; pp = &cmdtable[hashval % CMDTABLESIZE]; for (cmdp = *pp ; cmdp ; cmdp = cmdp->next) { if (equal(cmdp->cmdname, name)) |