Skip to content

Commit 87d8eb8

Browse files
committed
ensure that frame->retry always has the same talloc parent
1 parent 6adce5a commit 87d8eb8

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

src/lib/unlang/interpret.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ unlang_frame_action_t result_calculate(request_t *request, unlang_stack_frame_t
610610
}
611611
REXDENT();
612612

613-
talloc_free(frame->state);
613+
TALLOC_FREE(frame->state);
614614
unlang_frame_perf_cleanup(frame);
615615
frame_state_init(stack, frame); /* Don't change p_result */
616616
return UNLANG_FRAME_ACTION_RETRY;
@@ -1528,15 +1528,11 @@ int unlang_interpret_set_timeout(request_t *request, fr_time_delta_t timeout)
15281528
unlang_stack_t *stack = request->stack;
15291529
unlang_stack_frame_t *frame = &stack->frame[stack->depth];
15301530
unlang_retry_t *retry;
1531-
TALLOC_CTX *frame_ctx;
15321531

15331532
fr_assert(!frame->retry);
15341533
fr_assert(fr_time_delta_ispos(timeout));
15351534

1536-
frame_ctx = frame->state;
1537-
if (!frame_ctx) frame_ctx = stack;
1538-
1539-
frame->retry = retry = talloc_zero(frame_ctx, unlang_retry_t);
1535+
frame->retry = retry = talloc_zero(stack, unlang_retry_t);
15401536
if (!frame->retry) return -1;
15411537

15421538
retry->request = request;

0 commit comments

Comments
 (0)