Merge branch 'master' of github.com:armijnhemel/binaryanalysis

armijnhemel · Nov 1, 2016 · 416103b · 416103b
2 parents 2d139a9 + e0beb03
commit 416103b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/bat-scan.config b/src/bat-scan.config
@@ -603,6 +603,7 @@ priority    = 0
 magic       = jpeg:jpegtrailer:jfif
 noscan      = text:xml:pdf:compressed:resource:audio:mp4:java:elf:graphics
 description = Carve JPEG/JFIF files from a file
+envvars     = JPEG_MAXIMUM=104857600
 enabled     = yes
 
 [lrzip]

diff --git a/src/bat/fwunpack.py b/src/bat/fwunpack.py
@@ -6727,8 +6727,13 @@ def searchUnpackJPEG(filename, tempdir=None, blacklist=[], offsets={}, scanenv={
 	## with NUL bytes have been removed. The alternative would be to do
 	## a full decoding of the JPEG data in the SOS section which is not
 	## trivial to implement.
-	## TODO: make configurable. For now set to 100 MiB.
+	## By default set this to 100 MiB.
 	jpegmaxsize = 104857600
+	if 'JPEG_MAXIMUM' in scanenv:
+		try:
+			jpegmaxsize = int(scanenv['JPEG_MAXIMUM'])
+		except:
+			pass
 
 	datafile = open(filename, 'rb')
 	## Start verifying the JFIF image.