2008-11-05
2008-11-05 12:10:06 by Henrik Grubbström (Grubba) <grubba@grubba.org>
-
6e7bda36fc481043d3d4557373cbece4dc7df15a
(10 lines)
(+5/-5)
[
Show
| Annotate
]
Branch: 7.4
Fixed memory waste bug in end_and_resize_shared_string().
Rev: src/stralloc.c:1.160
2:
|| This file is part of Pike. For copyright information see COPYRIGHT.
|| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
|| for more information.
- || $Id: stralloc.c,v 1.159 2008/06/23 18:56:56 mast Exp $
+ || $Id: stralloc.c,v 1.160 2008/11/05 12:10:06 grubba Exp $
*/
#include "global.h"
24:
#include <ctype.h>
#include <math.h>
- RCSID("$Id: stralloc.c,v 1.159 2008/06/23 18:56:56 mast Exp $");
+ RCSID("$Id: stralloc.c,v 1.160 2008/11/05 12:10:06 grubba Exp $");
/* #define STRALLOC_USE_PRIMES */
755: Inside #if defined(PIKE_DEBUG)
if(len > str->len)
Pike_fatal("Cannot extend string here!\n");
#endif
- if( str->len <= SHORT_STRING_THRESHOLD ?
- (len <= SHORT_STRING_THRESHOLD) :
- (len > SHORT_STRING_THRESHOLD) && str->len > len/2 )
+ if( (str->len <= SHORT_STRING_THRESHOLD) ||
+ ((len > SHORT_STRING_THRESHOLD) && (str->len <= (len<<1))) )
{
str->len=len;
str->str[len]=0;