diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-25 19:40:55 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-25 19:40:55 +0000 |
| commit | 3508bb5b0d15f7a15b1bc4a634f34cd8880434cd (patch) | |
| tree | cfec3979f1a391a03af0362dfdd369fc3c9bc6ab | |
| parent | e5a6d1174192d1028c9b3071d81a69df5100ad82 (diff) | |
Fix error where "/0" CIDR notation could be unpredictable.
AST-2010-003
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.0.25@248847 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/acl.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/main/acl.c b/main/acl.c index e70b122af..bfb944488 100644 --- a/main/acl.c +++ b/main/acl.c @@ -292,7 +292,14 @@ struct ast_ha *ast_append_ha(const char *sense, const char *stuff, struct ast_ha if (!strchr(nm, '.')) { if ((sscanf(nm, "%30d", &x) == 1) && (x >= 0) && (x <= 32)) - ha->netmask.s_addr = htonl(0xFFFFFFFF << (32 - x)); + if (x == 0) { + /* This is special-cased to prevent unpredictable + * behavior of shifting left 32 bits + */ + ha->netmask.s_addr = 0; + } else { + ha->netmask.s_addr = htonl(0xFFFFFFFF << (32 - x)); + } else { ast_log(LOG_WARNING, "Invalid CIDR in %s\n", stuff); ast_free(ha); |