[Cmake-commits] CMake branch, next, updated. v2.8.2-739-g4e00f96

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  4e00f96c19ab7da885556437fbf54122ba81a748 (commit)
       via  b9c41813d29be3a520d196ce3abfb533fb5c0dbb (commit)
       via  87fde60563a3915234b33192d7f20b2af0c37206 (commit)
      from  640dd35834d8056c36770f7ca9b35474dd109724 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e00f96c19ab7da885556437fbf54122ba81a748
commit 4e00f96c19ab7da885556437fbf54122ba81a748
Merge: 640dd35 b9c4181
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 10 09:04:49 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 10 09:04:49 2010 -0400

    Merge topic 'suppress-Wcast-align' into next
    
    b9c4181 libarchive: Fix purposeful crash
    87fde60 Suppress -Wcast-align in curl and bzip2


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b9c41813d29be3a520d196ce3abfb533fb5c0dbb
commit b9c41813d29be3a520d196ce3abfb533fb5c0dbb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 10 08:58:19 2010 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 10 09:00:48 2010 -0400

    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.

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. */
 }
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87fde60563a3915234b33192d7f20b2af0c37206
commit 87fde60563a3915234b33192d7f20b2af0c37206
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 10 08:56:37 2010 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 10 09:00:48 2010 -0400

    Suppress -Wcast-align in curl and bzip2
    
    Trust upstream developers of third-party code.

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.

-----------------------------------------------------------------------

Summary of changes:
 Utilities/cmbzip2/bzlib_private.h                  |    3 +++
 Utilities/cmcurl/setup.h                           |    4 ++++
 .../cmlibarchive/libarchive/archive_check_magic.c  |    2 +-
 3 files changed, 8 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake