From: Richard Mudgett <rmudgett@digium.com>
Date: Fri, 26 Sep 2014 15:19:39 +0000 (+0000)
Subject: res_fax: Fix out of bounds error in update_modem_bits().
X-Git-Tag: 12.7.0-rc1~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9e2370661a2cf004f8dba09101746c1cdf65613;p=thirdparty%2Fasterisk.git

res_fax: Fix out of bounds error in update_modem_bits().

ASTERISK-24357 #close
Reported by: Jeremy Laine
Patches:
      res_fax_bounds.patch (license #6561) patch uploaded by Jeremy Laine
	  Modified patch to not use magic numbers.
........

Merged revisions 423979 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 423983 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@423987 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_fax.c b/res/res_fax.c
index d1eb71983d..82e874703b 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -625,7 +625,7 @@ static int update_modem_bits(enum ast_fax_modems *bits, const char *value)
 		m[i] = NULL;
 	} else {
 		tok = strtok(v, ", ");
-		while (tok && (i < 5)) {
+		while (tok && i < ARRAY_LEN(m) - 1) {
 			m[i++] = tok;
 			tok = strtok(NULL, ", ");
 		}