kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 10:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 248946 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r248946 | mmichelson | 2010-02-25 16:41:48 -0600 (Thu, 25 Feb 2010) | 5 lines
  
  Fix incorrect ACL behavior when CIDR notation of "/0" is used.
  
  AST-2010-003
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@248948 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2010-02-25 22:42:35 +00:00
parent 5407f8b38d
commit a25b721665
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/acl.c
View File

@@ -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);