[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-537-ge69434f

[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  e69434fa257c42e39b96101c37c39e9178369573 (commit)
       via  e1da4dc2dd55926c9d7140f830a5338512279b3f (commit)
      from  3646f09c7144daafc0d75e96d35031b959b29300 (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=e69434fa257c42e39b96101c37c39e9178369573
commit e69434fa257c42e39b96101c37c39e9178369573
Merge: 3646f09 e1da4dc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 11:35:54 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 20 11:35:54 2015 -0500

    Merge topic 'CheckStructHasMember-fix-null-deref-warning' into next
    
    e1da4dc2 CheckStructHasMember: fix null deref warning (#15413)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1da4dc2dd55926c9d7140f830a5338512279b3f
commit e1da4dc2dd55926c9d7140f830a5338512279b3f
Author:     Peter Wu <peter at lekensteyn.nl>
AuthorDate: Mon Feb 16 00:22:10 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 20 11:21:43 2015 -0500

    CheckStructHasMember: fix null deref warning (#15413)
    
    Clang Static Analyzer is so smart that it reports a defect when this
    intended null-deref is encountered.  Use sizeof instead which has no
    runtime effects.

diff --git a/Modules/CheckStructHasMember.cmake b/Modules/CheckStructHasMember.cmake
index de31d2c..6c15205 100644
--- a/Modules/CheckStructHasMember.cmake
+++ b/Modules/CheckStructHasMember.cmake
@@ -69,7 +69,7 @@ macro (CHECK_STRUCT_HAS_MEMBER _STRUCT _MEMBER _HEADER _RESULT)
 ${_INCLUDE_FILES}
 int main()
 {
-   (void)((${_STRUCT} *)0)->${_MEMBER};
+   (void)sizeof(((${_STRUCT} *)0)->${_MEMBER});
    return 0;
 }
 ")

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

Summary of changes:
 Modules/CheckStructHasMember.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake