From: Viktor Szakats <commit@vsz.me>
Date: Sun, 6 Jul 2025 10:35:00 +0000 (+0200)
Subject: rustls: apply memory function overrides, fixing an ECH buffer free
X-Git-Tag: rc-8_15_0-3~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cbf261e2de9f349c5b1ef0a8dc980988558455c5;p=thirdparty%2Fcurl.git

rustls: apply memory function overrides, fixing an ECH buffer free

Fixing:

- a raw `free()` in ECH code that's malloced in lib code, causing
  an invalid free, also reported by valgrind (in non-unity builds).

  And in unity builds adjusted to behave like non-unity via #17827:
  Ref: https://github.com/curl/curl/actions/runs/16093372427/job/45421778472?pr=17827#step:39:3321

- a local pair of `malloc()`/`free()` to use curl's memory allocators,
  and participate in memory tracking when enabled.

Cherry-picked from #17827
Closes #17830
---

diff --git a/lib/vtls/rustls.c b/lib/vtls/rustls.c
index ca318d5f4e..7071df88d9 100644
--- a/lib/vtls/rustls.c
+++ b/lib/vtls/rustls.c
@@ -43,6 +43,10 @@
 #include "cipher_suite.h"
 #include "x509asn1.h"
 
+/* The last #include files should be: */
+#include "../curl_memory.h"
+#include "../memdebug.h"
+
 struct rustls_ssl_backend_data
 {
   const struct rustls_client_config *config;