pike.git/ src/ cpp.cmod

2018-08-21

2018-08-21 09:09:18 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 3688c9074ae8c93aa1da653ee3507ab86aa73dd9 (6 lines) (+4/-2) ^{[ Show | Annotate ]}
  Branch: master

Cpp: Fixed reference counting issue in macro expansion.

The arguments array lost a reference for each callback function call.

Also protect against callback functions throwing errors.

333:    default:    /* FIXME: Check that we have a callable. */    if (arguments) { +  add_ref(arguments);    push_array_items(arguments); -  apply_svalue(sval, arguments->size); +  safe_apply_svalue(sval, arguments->size, 1);    } else { -  apply_svalue(sval, 0); +  safe_apply_svalue(sval, 0, 1);    }    if (TYPEOF(Pike_sp[-1]) != T_STRING) {    my_yyerror("Invalid return value from macro: %s (expected string).",