pike.git/ src/ array.c

2008-07-24

2008-07-24 15:30:56 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 0cd43dd6c01771c760c912771b31f96fc666e8b3 (5 lines) (+3/-2) ^{[ Show | Annotate ]}
  Branch: 7.9

The test in add_arrays() was a bit too restrictive...

Rev: src/array.c:1.221

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: array.c,v 1.220 2008/07/24 14:47:47 grubba Exp $ + || $Id: array.c,v 1.221 2008/07/24 15:30:56 grubba Exp $   */      #include "global.h"
1606: Inside #if 1
   if(v->refs == 1 && v->malloced_size >= size)    {    if (((v->item - v->real_item) >= tmp) && -  ((v->item + size) <= (v->real_item + v->malloced_size))) { +  ((v->item + size - tmp) <= (v->real_item + v->malloced_size))) {    /* There's enough space before and after. */    debug_malloc_touch(v);    mark_free_svalue(argp + e);