From: Mark Michelson <mmichelson@digium.com>
Date: Thu, 25 Feb 2010 22:42:53 +0000 (+0000)
Subject: Merged revisions 248946 via svnmerge from
X-Git-Tag: 1.6.2.6-rc1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33cba8475f612cb744e61d5c9870f8d9801f4a8d;p=thirdparty%2Fasterisk.git

Merged revisions 248946 via svnmerge from
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.2@248949 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/acl.c b/main/acl.c
index 5ee6ef0fb2..6a473ee9be 100644
--- a/main/acl.c
+++ b/main/acl.c
@@ -298,7 +298,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);