Merge pull request #14014 from xokdvium/fish delete

Mic92 · web-flow · commit 4808b0e24f5b · 2025-09-18T08:08:39.000+02:00
libexpr-c: Fix mismatched new/delete
diff --git a/src/libexpr-c/nix_api_expr.cc b/src/libexpr-c/nix_api_expr.cc
@@ -137,7 +137,7 @@ nix_eval_state_builder * nix_eval_state_builder_new(nix_c_context * context, Sto
 
 void nix_eval_state_builder_free(nix_eval_state_builder * builder)
 {
-    delete builder;
+    operator delete(builder, static_cast<std::align_val_t>(alignof(nix_eval_state_builder)));
 }
 
 nix_err nix_eval_state_builder_load(nix_c_context * context, nix_eval_state_builder * builder)
@@ -203,7 +203,7 @@ EvalState * nix_state_create(nix_c_context * context, const char ** lookupPath_c
 
 void nix_state_free(EvalState * state)
 {
-    delete state;
+    operator delete(state, static_cast<std::align_val_t>(alignof(EvalState)));
 }
 
 #if NIX_USE_BOEHMGC

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ nix_eval_state_builder * nix_eval_state_builder_new(nix_c_context * context, Sto`
`137`	`137`
`138`	`138`	`void nix_eval_state_builder_free(nix_eval_state_builder * builder)`
`139`	`139`	`{`
`140`		`- delete builder;`
	`140`	`+ operator delete(builder, static_cast<std::align_val_t>(alignof(nix_eval_state_builder)));`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`nix_err nix_eval_state_builder_load(nix_c_context * context, nix_eval_state_builder * builder)`
`@@ -203,7 +203,7 @@ EvalState * nix_state_create(nix_c_context * context, const char ** lookupPath_c`
`203`	`203`
`204`	`204`	`void nix_state_free(EvalState * state)`
`205`	`205`	`{`
`206`		`- delete state;`
	`206`	`+ operator delete(state, static_cast<std::align_val_t>(alignof(EvalState)));`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`#if NIX_USE_BOEHMGC`