[Pkg-voip-commits] r5986 - /asterisk/branches/etch/debian/patches/AST-2008-010.dpatch

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Thu Jul 24 08:38:37 2008
New Revision: 5986

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5986
Log:
Apply the fixes from Asterisk 1.2.30.1 .

Modified:
    asterisk/branches/etch/debian/patches/AST-2008-010.dpatch

Modified: asterisk/branches/etch/debian/patches/AST-2008-010.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/etch/debian/patches/AST-2008-010.dpatch?rev=5986&op=diff
==============================================================================
--- asterisk/branches/etch/debian/patches/AST-2008-010.dpatch (original)
+++ asterisk/branches/etch/debian/patches/AST-2008-010.dpatch Thu Jul 24 08:38:37 2008
@@ -4,7 +4,7 @@
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Fix IAX 'POKE' resource exhaustion
 ## DP: AST-2008-010/CVE-2008-3263
-## DP: upstream r132711
+## DP: upstream r132711, r133360
 
 @DPATCH@
 Index: channels/chan_iax2.c
@@ -20,6 +20,19 @@
  			ast_mutex_lock(&iaxsl[x]);
  			if (iaxs[x]) {
  				/* Look for an exact match */
+@@ -1317,10 +1318,10 @@
+ 
+ 		gettimeofday(&now, NULL);
+ 
+-		start = 1 + (rand() % (TRUNK_CALL_START - 1));
++		start = 2 + (rand() % (TRUNK_CALL_START - 1));
+ 		for (x = start; 1; x++) {
+ 			if (x == TRUNK_CALL_START) {
+-				x = 0;
++				x = 1;
+ 				continue;
+ 			}
+ 
 @@ -3098,6 +3099,15 @@
  	char *options;
  };