This commit is contained in:
John Kerl 2017-01-22 22:02:51 -05:00
parent bdd3b2cbb1
commit 1e694fba15
2 changed files with 3 additions and 3 deletions

View file

@ -112,7 +112,6 @@ static void handle_full_srec_assignment(
} else {
mlhmmv_xvalue_free(&boxed_xval.xval);
}
// xxx needs a clear-and-move-all ...
lrec_free(pvars->pinrec);
lhmsmv_free(pvars->ptyped_overlay);
pvars->pinrec = poutrec;

View file

@ -561,7 +561,7 @@ static sllv_t* mapper_put_or_filter_process(lrec_t* pinrec, context_t* pctx, voi
should_emit_rec = TRUE;
variables_t variables = (variables_t) {
.pinrec = pinrec,
.pinrec = pinrec, // Note variables.pinrec pointer can update on '$* = ...'
.ptyped_overlay = ptyped_overlay,
.poosvars = pstate->poosvars,
.ppregex_captures = &pregex_captures,
@ -605,10 +605,11 @@ static sllv_t* mapper_put_or_filter_process(lrec_t* pinrec, context_t* pctx, voi
lhmsmv_free(variables.ptyped_overlay);
string_array_free(pregex_captures);
// Note variables.pinrec pointer can update on '$* = ...'
if (should_emit_rec && !pstate->put_output_disabled) {
sllv_append(poutrecs, variables.pinrec);
} else {
lrec_free(variables.pinrec); // xxx variables.pinrec mess from reassign in #* = ...
lrec_free(variables.pinrec);
}
return poutrecs;
}