pike.git/ src/ builtin_functions.c

2010-07-27

2010-07-27 15:33:37 by Martin Stjernholm <mast@lysator.liu.se>

• e6c089d1027d90013337e34fa50c897825ce98a7 (21 lines) (+16/-5) ^{[ Show | Annotate ]}
  Branch: 7.9

Fixed segfault for allocate (17, UNDEFINED).

Also restored compatibility with previous pike versions in that situation.

Rev: src/builtin_functions.c:1.703
Rev: src/testsuite.in:1.898

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: builtin_functions.c,v 1.702 2010/07/19 15:30:48 mast Exp $ + || $Id: builtin_functions.c,v 1.703 2010/07/27 15:33:37 mast Exp $   */      #include "global.h"
2559:   {    INT_TYPE size;    struct array *a; -  struct svalue *init; +  struct svalue *init = NULL;       get_all_args("allocate", args, "%+.%*", &size, &init);    if (size > MAX_INT32)
2570:    {    INT32 e;    push_array (a); +  if (init) {    for(e=0;e<size;e++)    copy_svalues_recursively_no_free(a->item+e, init, 1, 0);    a->type_field = 1 << init->type; -  +  } +  else { +  /* It's somewhat quirky that allocate(17) and allocate(17, UNDEFINED) +  * have different behavior, but it's of some use, and it's compatible +  * with previous versions. */ +  for(e=0;e<size;e++) +  ITEM (a)[e] = svalue_undefined; +  a->type_field = BIT_INT; +  }    stack_pop_n_elems_keep_top (args);    }    else {