From fdaf8f88ec6558c91ed46a770151e93b19fbe7ea Mon Sep 17 00:00:00 2001 From: John Kerl Date: Fri, 25 Nov 2022 23:05:21 -0500 Subject: [PATCH] Fix #1108 (#1129) --- c/mapping/mapper_reshape.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/c/mapping/mapper_reshape.c b/c/mapping/mapper_reshape.c index d0e0b2a802..3c9a4a4b7c 100644 --- a/c/mapping/mapper_reshape.c +++ b/c/mapping/mapper_reshape.c @@ -294,18 +294,16 @@ static void mapper_reshape_free(mapper_t* pmapper, context_t* _) { static sllv_t* mapper_reshape_wide_to_long_no_regex_process(lrec_t* pinrec, context_t* pctx, void* pvstate) { if (pinrec == NULL) // End of input stream return sllv_single(NULL); + mapper_reshape_state_t* pstate = (mapper_reshape_state_t*)pvstate; sllv_t* poutrecs = sllv_alloc(); lhmss_t* pairs = lhmss_alloc(); - char* pfree_flags = NULL; for (sllse_t* pe = pstate->input_field_names->phead; pe != NULL; pe = pe->pnext) { char* key = pe->value; - char* value = lrec_get_pff(pinrec, key, &pfree_flags); + char* value = lrec_get(pinrec, key); if (value != NULL) { - // Ownership-transfer of the about-to-be-freed key-value pairs from lrec to lhmss - lhmss_put(pairs, key, value, *pfree_flags); - *pfree_flags = NO_FREE; + lhmss_put(pairs, mlr_strdup_or_die(key), mlr_strdup_or_die(value), FREE_ENTRY_KEY | FREE_ENTRY_VALUE); } }