From 87fde60563a3915234b33192d7f20b2af0c37206 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 10 Sep 2010 08:56:37 -0400 Subject: Suppress -Wcast-align in curl and bzip2 Trust upstream developers of third-party code. --- Utilities/cmbzip2/bzlib_private.h | 3 +++ Utilities/cmcurl/setup.h | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/Utilities/cmbzip2/bzlib_private.h b/Utilities/cmbzip2/bzlib_private.h index 147dbb8..02a667f 100644 --- a/Utilities/cmbzip2/bzlib_private.h +++ b/Utilities/cmbzip2/bzlib_private.h @@ -47,6 +47,9 @@ /* warning C4127: conditional expression is constant*/ # pragma warning(disable:4127) #endif +#if defined(__clang__) +# pragma clang diagnostic ignored "-Wcast-align" +#endif /*-- General stuff. --*/ diff --git a/Utilities/cmcurl/setup.h b/Utilities/cmcurl/setup.h index c49e63d..e302f35 100644 --- a/Utilities/cmcurl/setup.h +++ b/Utilities/cmcurl/setup.h @@ -42,6 +42,10 @@ #define WIN32 #endif +#if defined(__clang__) +# pragma clang diagnostic ignored "-Wcast-align" +#endif + /* * Include configuration script results or hand-crafted * configuration file for platforms which lack config tool. -- cgit v0.12 From b9c41813d29be3a520d196ce3abfb533fb5c0dbb Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 10 Sep 2010 08:58:19 -0400 Subject: libarchive: Fix purposeful crash Dereferencing a 0-pointer is undefined behavior, not a deterministic crash. Use a 1-pointer instead. This also avoids a warning by Clang about the undefined behavior. --- Utilities/cmlibarchive/libarchive/archive_check_magic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/cmlibarchive/libarchive/archive_check_magic.c b/Utilities/cmlibarchive/libarchive/archive_check_magic.c index a9177d7..e9dbe51 100644 --- a/Utilities/cmlibarchive/libarchive/archive_check_magic.c +++ b/Utilities/cmlibarchive/libarchive/archive_check_magic.c @@ -69,7 +69,7 @@ diediedie(void) /* Cause a breakpoint exception */ DebugBreak(); #endif - *(char *)0 = 1; /* Deliberately segfault and force a coredump. */ + *(char *)1 = 1; /* Deliberately segfault and force a coredump. */ _exit(1); /* If that didn't work, just exit with an error. */ } -- cgit v0.12