Commits

oliver_g committed 3e2f047

nds parser: add some more validation checks

Comments (0)

Files changed (1)

hachoir-parser/hachoir_parser/program/nds.py

         return (self.stream.readBytes(0, 1) != "\0"
             and (header["device_code"].value & 7) == 0
             and header["header_size"].value >= 352
+            and header["card_size"].value < 15 # arbitrary limit at 32Gbit
             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
+            and header["arm9_execute_addr"].value >= 0x02000000 and header["arm9_execute_addr"].value <= 0x023bfe00
+            and header["arm9_copy_to_addr"].value >= 0x02000000 and header["arm9_copy_to_addr"].value <= 0x023bfe00
+            and header["arm7_execute_addr"].value >= 0x02000000 and header["arm7_execute_addr"].value <= 0x03807e00
+            and header["arm7_copy_to_addr"].value >= 0x02000000 and header["arm7_copy_to_addr"].value <= 0x03807e00
             )
 
     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.