Additional validation to installshield cabinet files

926a7535 · devttys0 · 7464f3ea · 926a7535 · 926a7535
Commit 926a7535 authored Apr 09, 2014 by devttys0
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletions

binwalk src/binwalk/magic/binwalk +0 -0

archives src/magic/archives +4 -1

No files found.
--- a/src/binwalk/magic/binwalk
+++ b/src/binwalk/magic/binwalk
--- a/src/magic/archives
+++ b/src/magic/archives
@@ -277,7 +277,10 @@
 0       string          ISc(            InstallShield Cabinet archive data
 # TODO: Version number checks should be made more specific for false positive filtering
 >5      byte&0xf0       =0x60           version 6,
->5      byte&0xf0       !0x60           version 4/5,
+>5      byte&0xf0       <0x60           version 4/5,
+>5      byte&0xf0       >0x60           invalid version,
+>12     lelong          <0              invalid offset,
+>12     lelong          >100000         invalid offset,
 >(12.l+40)      lelong  x               %u files

 # Windows CE package files