[asterisk-commits] tilghman: branch 1.6.2 r186022 - in /branches/1.6.2: ./ main/strings.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Thu Apr  2 10:15:22 2009
New Revision: 186022

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=186022
Log:
Merged revisions 186021 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r186021 | tilghman | 2009-04-02 10:14:22 -0500 (Thu, 02 Apr 2009) | 7 lines
  
  Missed a common case for needing to extend the buffer.
  (closes issue #14716)
   Reported by: sum
   Patches: 
         20090402__bug14716.diff.txt uploaded by tilghman (license 14)
   Tested by: sum
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/strings.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/strings.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/main/strings.c?view=diff&rev=186022&r1=186021&r2=186022
==============================================================================
--- branches/1.6.2/main/strings.c (original)
+++ branches/1.6.2/main/strings.c Thu Apr  2 10:15:22 2009
@@ -143,7 +143,8 @@
 		maxlen--;
 		(*buf)->__AST_STR_USED++;
 
-		if (dynamic && (!maxlen || (escapecommas && !(maxlen - 1)))) {
+		if ((ptr >= (*buf)->__AST_STR_STR + (*buf)->__AST_STR_LEN - 3) ||
+			(dynamic && (!maxlen || (escapecommas && !(maxlen - 1))))) {
 			char *oldbase = (*buf)->__AST_STR_STR;
 			size_t old = (*buf)->__AST_STR_LEN;
 			if (ast_str_make_space(buf, (*buf)->__AST_STR_LEN * 2)) {