[svn-commits] rmudgett: branch 12 r423987 - in /branches/12: ./ res/res_fax.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Sep 26 10:19:39 2014
New Revision: 423987

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=423987
Log:
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

Modified:
    branches/12/   (props changed)
    branches/12/res/res_fax.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/res/res_fax.c?view=diff&rev=423987&r1=423986&r2=423987
==============================================================================
--- branches/12/res/res_fax.c (original)
+++ branches/12/res/res_fax.c Fri Sep 26 10:19:39 2014
@@ -625,7 +625,7 @@
 		m[i] = NULL;
 	} else {
 		tok = strtok(v, ", ");
-		while (tok && (i < 5)) {
+		while (tok && i < ARRAY_LEN(m) - 1) {
 			m[i++] = tok;
 			tok = strtok(NULL, ", ");
 		}