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 49e1c1d7819707a52a5acf37dad5457c4ea3061b (commit)
via 22ff7d51595092f5e12e0d604ba5c808ca1e9447 (commit)
from 199e3b8d359905d04539712cb67a8d3e2a371735 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49e1c1d7819707a52a5acf37dad5457c4ea3061b
commit 49e1c1d7819707a52a5acf37dad5457c4ea3061b
Merge: 199e3b8 22ff7d5
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Nov 19 13:18:46 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Nov 19 13:18:46 2015 -0500
Merge topic 'avoid-divide-by-zero' into next
22ff7d51 cmELF: Avoid divide by zero if there are no dynamic sections
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22ff7d51595092f5e12e0d604ba5c808ca1e9447
commit 22ff7d51595092f5e12e0d604ba5c808ca1e9447
Author: Ty Smith <tyfigh...@gmail.com>
AuthorDate: Thu Nov 19 11:04:34 2015 -0600
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Nov 19 13:17:16 2015 -0500
cmELF: Avoid divide by zero if there are no dynamic sections
diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx
index d062987..37dd328 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -567,8 +567,14 @@ bool cmELFInternalImpl<Types>::LoadDynamicSection()
return true;
}
- // Allocate the dynamic section entries.
+ // If there are no entries we are done.
ELF_Shdr const& sec = this->SectionHeaders[this->DynamicSectionIndex];
+ if(sec.sh_entsize == 0)
+ {
+ return false;
+ }
+
+ // Allocate the dynamic section entries.
int n = static_cast<int>(sec.sh_size / sec.sh_entsize);
this->DynamicSectionEntries.resize(n);
-----------------------------------------------------------------------
Summary of changes:
Source/cmELF.cxx | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
