From: Collin Funk <collin.funk1@gmail.com>
Date: Wed, 15 Oct 2025 01:30:47 +0000 (-0700)
Subject: getdelim: Avoid the symbol __getdelim with ASAN (regr. 2025-10-13).
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9be0da9b06851b5873842f658150a380e02102c8;p=thirdparty%2Fgnulib.git

getdelim: Avoid the symbol __getdelim with ASAN (regr. 2025-10-13).

* lib/stdio.in.h (rpl_getdelim)
[__GLIBC__ >= 2 && !__ADDRESS_SANITIZER__]: Don't define to __getdelim
so that ___interceptor_getdelim doesn't override our symbol.
---

diff --git a/ChangeLog b/ChangeLog
index c3dd9cbb7f..c8af7641b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2025-10-14  Collin Funk  <collin.funk1@gmail.com>
 
+	getdelim: Avoid the symbol __getdelim with ASAN (regr. 2025-10-13).
+	* lib/stdio.in.h (rpl_getdelim)
+	[__GLIBC__ >= 2 && !__ADDRESS_SANITIZER__]: Don't define to __getdelim
+	so that ___interceptor_getdelim doesn't override our symbol.
+
 	glob: Ensure --enable-cross-guesses is obeyed (regr. yesterday).
 	Reported by Bruno Haible in
 	<https://lists.gnu.org/archive/html/bug-gnulib/2025-10/msg00041.html>.
diff --git a/lib/stdio.in.h b/lib/stdio.in.h
index 2c70bc049f..cc6010119d 100644
--- a/lib/stdio.in.h
+++ b/lib/stdio.in.h
@@ -1044,9 +1044,15 @@ _GL_CXXALIASWARN (getchar);
 #   undef getdelim
 #   define getdelim rpl_getdelim
 #  endif
-#  if __GLIBC__ >= 2
+#  ifndef __has_feature
+#   define __has_feature(a) 0
+#  endif
+#  if __GLIBC__ >= 2 && !(defined __SANITIZE_ADDRESS__ \
+                          || __has_feature (address_sanitizer))
 /* Arrange for the inline definition of getline() in <bits/stdio.h>
-   to call our getdelim() override.  */
+   to call our getdelim() override.  Do not use the __getdelim symbol
+   if address sanitizer is in use, otherwise it may be overridden by
+   __interceptor_trampoline___getdelim.  */
 #   define rpl_getdelim __getdelim
 #  endif
 _GL_FUNCDECL_RPL (getdelim, ssize_t,