[Pkg-voip-commits] r10076 - in /asterisk/branches/squeeze/debian: changelog patches/AST-2012-014

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Mon Jan 14 18:04:37 2013
New Revision: 10076

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10076
Log:
Fix an error in patch AST-2012-014.

Modified:
    asterisk/branches/squeeze/debian/changelog
    asterisk/branches/squeeze/debian/patches/AST-2012-014

Modified: asterisk/branches/squeeze/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/squeeze/debian/changelog?rev=10076&op=diff
==============================================================================
--- asterisk/branches/squeeze/debian/changelog (original)
+++ asterisk/branches/squeeze/debian/changelog Mon Jan 14 18:04:37 2013
@@ -1,6 +1,7 @@
 asterisk (1:1.6.2.9-2+squeeze10) stable-security; urgency=high
 
   * Fix typo in patch AST-2012-015 (Closes: #698112, #698118).
+  * Fix an error in patch AST-2012-014.
 
  -- Tzafrir Cohen <tzafrir at debian.org>  Mon, 14 Jan 2013 15:15:28 +0200
 

Modified: asterisk/branches/squeeze/debian/patches/AST-2012-014
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/squeeze/debian/patches/AST-2012-014?rev=10076&op=diff
==============================================================================
--- asterisk/branches/squeeze/debian/patches/AST-2012-014 (original)
+++ asterisk/branches/squeeze/debian/patches/AST-2012-014 Mon Jan 14 18:04:37 2013
@@ -27,7 +27,7 @@
  
  			/* Read in headers one line at a time */
 -			while (req.len < 4 || strncmp(REQ_OFFSET_TO_STR(&req, len - 4), "\r\n\r\n", 4)) {
-+			while ((req.len <= SIP_MAX_PACKET_SIZE) || (req.len < 4 || strncmp(REQ_OFFSET_TO_STR(&req, len - 4), "\r\n\r\n", 4))) {
++			while ((req.len <= SIP_MAX_PACKET_SIZE) && (req.len < 4 || strncmp(REQ_OFFSET_TO_STR(&req, len - 4), "\r\n\r\n", 4))) {
  				if (!tcptls_session->client && !authenticated ) {
  					if ((timeout = sip_check_authtimeout(start)) < 0) {
  						goto cleanup;