You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2016/07/02 23:58:48 UTC
[1/2] mesos git commit: Fixed an incorrect check in stout/elf.hpp.
Repository: mesos
Updated Branches:
refs/heads/master 14458c81e -> 60db4ceda
Fixed an incorrect check in stout/elf.hpp.
Review: https://reviews.apache.org/r/49567/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a2d0a9ec
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a2d0a9ec
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a2d0a9ec
Branch: refs/heads/master
Commit: a2d0a9ece347dc654f81f2a31bab705f8d343b7e
Parents: 14458c8
Author: Kevin Klues <kl...@gmail.com>
Authored: Sat Jul 2 16:53:15 2016 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Sat Jul 2 16:53:34 2016 -0700
----------------------------------------------------------------------
3rdparty/stout/include/stout/elf.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/a2d0a9ec/3rdparty/stout/include/stout/elf.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/elf.hpp b/3rdparty/stout/include/stout/elf.hpp
index 94b1de9..7ee840c 100644
--- a/3rdparty/stout/include/stout/elf.hpp
+++ b/3rdparty/stout/include/stout/elf.hpp
@@ -192,7 +192,7 @@ public:
(uint32_t*)descriptor,
(uint32_t*)((char*)descriptor + descriptor_size));
- if (version.size() != 4 && version[0] != 0) {
+ if (version.size() != 4 || version[0] != 0) {
return Error("Corrupt version '" + stringify(version) + "'"
" from entry in '.note.ABI-tag' section");
}
[2/2] mesos git commit: Cleaned up some logic in stout/elf.hpp.
Posted by bm...@apache.org.
Cleaned up some logic in stout/elf.hpp.
This logic originally worked around a bug in ELFIO. We now
include a .patch for ELFIO that makes this unnecessary.
Review: https://reviews.apache.org/r/49567/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/60db4ced
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/60db4ced
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/60db4ced
Branch: refs/heads/master
Commit: 60db4cedab746159b198df20a19dbc57678baddb
Parents: a2d0a9e
Author: Kevin Klues <kl...@gmail.com>
Authored: Sat Jul 2 16:54:24 2016 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Sat Jul 2 16:54:24 2016 -0700
----------------------------------------------------------------------
3rdparty/stout/include/stout/elf.hpp | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/60db4ced/3rdparty/stout/include/stout/elf.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/elf.hpp b/3rdparty/stout/include/stout/elf.hpp
index 7ee840c..2bf91a0 100644
--- a/3rdparty/stout/include/stout/elf.hpp
+++ b/3rdparty/stout/include/stout/elf.hpp
@@ -175,10 +175,7 @@ public:
}
// Linux mandates `name == GNU`.
- // However, ELFIO seems to include '\0' in the string itself
- // when constructing `name`, so instead we make sure that
- // `name` starts with "GNU" instead.
- if (!strings::startsWith(name, "GNU")) {
+ if (name != "GNU") {
return Error("Corrupt label '" + name + "' from"
" entry in '.note.ABI-tag' section");
}