dyld-353.2.3.tar.gz

[apple/dyld.git] / launch-cache / MachOTrie.hpp

diff --git a/launch-cache/MachOTrie.hpp b/launch-cache/MachOTrie.hpp
index 05a8e070387fbee0682a8f9ed5b9e39dcf9062e3..7720b11d11a23e5116b942f3a424588bc7f92c74 100644 (file)
--- a/launch-cache/MachOTrie.hpp
+++ b/launch-cache/MachOTrie.hpp
@@ -25,6 +25,7 @@
 #define __MACH_O_TRIE__
 
 #include <algorithm>
+#include <vector>
 
 #include "MachOFileAbstraction.hpp"
 
@@ -245,12 +246,19 @@ inline uint64_t read_uleb128(const uint8_t*& p, const uint8_t* end) {
        int              bit = 0;
        do {
                if (p == end)
+#if __EXCEPTIONS
                        throw "malformed uleb128 extends beyond trie";
-
+#else
+                       return result;
+#endif
                uint64_t slice = *p & 0x7f;
 
                if (bit >= 64 || slice << bit >> bit != slice)
+#if __EXCEPTIONS
                        throw "uleb128 too big for 64-bits";
+#else
+                       return result;
+#endif
                else {
                        result |= (slice << bit);
                        bit += 7;
@@ -321,7 +329,11 @@ static inline void processExportNode(const uint8_t* const start, const uint8_t*
                                                                        std::vector<EntryWithOffset>& output) 
 {
        if ( p >= end )
+#if __EXCEPTIONS
                throw "malformed trie, node past end";
+#else
+               return;
+#endif
        const uint8_t terminalSize = read_uleb128(p, end);
        const uint8_t* children = p + terminalSize;
        if ( terminalSize != 0 ) {