Merge branch 'devel' into jreiser-macho

2017-12-26 10:41:26 -08:00
parent 59f18b9d9f aefb2fa3c3
commit 79e65503a9
8 changed files with 681 additions and 607 deletions
@@ -1485,7 +1485,7 @@ void PackMachBase<T>::unpack(OutputFile *fo)
        memcpy(&msegcmd[j], ptr, umin(sizeof(Mach_segment_command),
            ((Mach_command const *)ptr)->cmdsize));
        ptr += (unsigned) ((Mach_command const *)ptr)->cmdsize;
-        if (ptr_udiff(ptr, mhdr) > ph.u_len) {
+        if (ptr_udiff(ptr, (1+ mhdr)) > ph.u_len) {
            throwCantUnpack("cmdsize");
        }
    }