commit:     a285f1f17dccd79968a63e5acc35b5230c236389
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 04:56:53 2024 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 04:56:53 2024 +0000
URL:        https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=a285f1f1

drop old __BOUNDS_CHECKING_ON support

The out-of-tree patches for -fbounds-checking in GCC were great, but
they haven't been updated since the gcc-4.0 days, and the sanitizer
options have made it obsolete, so it's unlikely we'll ever use this
code again.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 porting.h |  7 -------
 pspax.c   | 10 ----------
 2 files changed, 17 deletions(-)

diff --git a/porting.h b/porting.h
index 42c9ba3..3a544fa 100644
--- a/porting.h
+++ b/porting.h
@@ -77,13 +77,6 @@
 #endif
 
 #undef PAX_UTILS_CLEANUP
-/* bounds checking code will fart on free(NULL) even though that
- * is valid usage.  So let's wrap it if need be.
- */
-#ifdef __BOUNDS_CHECKING_ON
-# define free(ptr) do { if (ptr) free(ptr); } while (0)
-# define PAX_UTILS_CLEANUP 1
-#endif
 /* LSAN (Leak Sanitizer) will complain about things we leak. */
 #ifdef __SANITIZE_ADDRESS__
 # define PAX_UTILS_CLEANUP 1

diff --git a/pspax.c b/pspax.c
index 6094882..e79469d 100644
--- a/pspax.c
+++ b/pspax.c
@@ -189,15 +189,6 @@ static int print_executable_mappings(int pfd)
        return 0;
 }
 
-#ifdef __BOUNDS_CHECKING_ON
-# define NOTE_TO_SELF warn( \
-       "This is bullshit but getpwuid() is leaking memory and I wasted a few 
hrs 1 day tracking it down in pspax\n" \
-       "Later on I forgot I tracked it down before and saw pspax leaking 
memory so I tracked it down all over again (silly me)\n" \
-       "Hopefully the getpwuid()/nis/nss/pam or whatever wont suck later on in 
the future.")
-#else
-# define NOTE_TO_SELF
-#endif
-
 static const struct passwd *get_proc_passwd(int pfd)
 {
        struct stat st;
@@ -577,6 +568,5 @@ int main(int argc, char *argv[])
 
        pspax(name);
 
-       NOTE_TO_SELF;
        return EXIT_SUCCESS;
 }

Reply via email to