oliver_g avatar oliver_g committed 4792e75

nds parser: fix validate() (don't raise exception for invalid files)

Comments (0)

Files changed (1)

hachoir-parser/hachoir_parser/program/nds.py

     endian = LITTLE_ENDIAN
 
     def validate(self):
+        try:
+            header = self["header"]
+        except Exception, e:
+            return False
+
         return (self.stream.readBytes(0, 1) != "\0"
-            and ((self["header"]["device_code"].value & 7) == 0)
-            and self["header"]["header_size"].value >= 352
-            and self["header"]["arm9_bin_size"].value > 0
-            and self["header"]["arm7_bin_size"].value > 0
-            and self["header"]["arm9_source"].value + self["header"]["arm9_bin_size"].value < self._size
-            and self["header"]["arm7_source"].value + self["header"]["arm7_bin_size"].value < self._size
+            and (header["device_code"].value & 7) == 0
+            and header["header_size"].value >= 352
+            and header["arm9_bin_size"].value > 0 and header["arm9_bin_size"].value <= 0x3bfe00
+            and header["arm7_bin_size"].value > 0 and header["arm7_bin_size"].value <= 0x3bfe00
+            and header["arm9_source"].value + header["arm9_bin_size"].value < self._size
+            and header["arm7_source"].value + header["arm7_bin_size"].value < self._size
             )
 
     def createFields(self):
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.