Merge pull request #37 from mrexodia/inrange-fixes

YOLO

minidump/__amain__.py

@@ -28,7 +28,7 @@ async def run():
 	parser.add_argument('--all', action='store_true', help='Show all info')
 	parser.add_argument('-r', '--read-addr', type=lambda x: int(x,0), help='Dump a memory region from the process\'s addres space')
 	parser.add_argument('-s', '--read-size', type=lambda x: int(x,0), default = 0x20, help='Dump a memory region from the process\'s addres space')
-	
+
 	args = parser.parse_args()
 	if args.verbose == 0:
 		logging.basicConfig(level=logging.INFO)
@@ -38,11 +38,11 @@ async def run():
 		logging.basicConfig(level=1)
 
 	print(__banner__)
-	
+
 
 	mf = await AMinidumpFile.parse(args.minidumpfile)
 	reader = mf.get_reader()
-		
+
 	if args.all or args.threads:
 		if mf.threads is not None:
 			print(str(mf.threads))
@@ -81,7 +81,7 @@ async def run():
 			print(str(mf.misc_info))
 	if args.all or args.header:
 		print(str(mf.header))
-			
+
 	if args.read_addr:
 		buff_reader = reader.get_buffered_reader()
 		await buff_reader.move(args.read_addr)

minidump/__main__.py

@@ -30,7 +30,7 @@ def run():
 	parser.add_argument('--all', action='store_true', help='Show all info')
 	parser.add_argument('-r', '--read-addr', type=lambda x: int(x,0), help='Dump a memory region from the process\'s addres space')
 	parser.add_argument('-s', '--read-size', type=lambda x: int(x,0), default = 0x20, help='Dump a memory region from the process\'s addres space')
-	
+
 	args = parser.parse_args()
 	if args.verbose == 0:
 		logging.basicConfig(level=logging.INFO)
@@ -40,17 +40,17 @@ def run():
 		logging.basicConfig(level=1)
 
 	print(__banner__)
-	
+
 	if args.interactive:
 		shell = MinidumpShell()
 		shell.do_open(args.minidumpfile)
 		shell.cmdloop()
 
 	else:
-		
+
 		mf = MinidumpFile.parse(args.minidumpfile)
 		reader = mf.get_reader()
-		
+
 		if args.all or args.threads:
 			if mf.threads is not None:
 				print(str(mf.threads))
@@ -89,7 +89,7 @@ def run():
 				print(str(mf.misc_info))
 		if args.all or args.header:
 			print(str(mf.header))
-				
+
 		if args.read_addr:
 			buff_reader = reader.get_buffered_reader()
 			buff_reader.move(args.read_addr)

minidump/_version.py

@@ -2,6 +2,6 @@
 __version__ = "0.0.22"
 __banner__ = \
 """
-# minidump %s 
+# minidump %s
 # Author: Tamas Jos @skelsec (skelsecprojects@gmail.com)
 """ % __version__

minidump/aminidumpreader.py

@@ -16,7 +16,7 @@ def __init__(self, start, end, start_file_address):
 		self.start_file_address = start_file_address
 
 		self.data = None
-	
+
 	def inrange(self, start, end):
 		return self.start <= start and end<= self.end
 
@@ -45,11 +45,11 @@ async def read(self, file_handle, start, end):
 		if end is None:
 			await file_handle.seek(self.start_file_address + start)
 			return await file_handle.read(self.end_address - (self.start_file_address + start))
-		
+
 		for chunk in self.chunks:
 			if chunk.inrange(start, end):
 				return chunk.data[start - chunk.start: end - chunk.start]
-		
+
 		if self.total_size <= 2*self.chunksize:
 			chunksize = self.total_size
 			vs = VirtualSegment(0, chunksize, self.start_file_address)
@@ -61,12 +61,12 @@ async def read(self, file_handle, start, end):
 		chunksize = max((end-start), self.chunksize)
 		if start + chunksize > self.end_address:
 			chunksize = self.end_address - start
-		
+
 		vs = VirtualSegment(start, start+chunksize, self.start_file_address + start)
 		await file_handle.seek(vs.start_file_address)
 		vs.data = await file_handle.read(chunksize)
 		self.chunks.append(vs)
-		
+
 		return vs.data[start - vs.start: end - vs.start]
 
 class AMinidumpBufferedReader:
@@ -157,7 +157,7 @@ async def peek(self, length):
 		Returns up to length bytes from the current memory segment
 		"""
 		t = self.current_position + length
-		if not self.current_segment.inrange(t):
+		if not self.current_segment.inrange(t - 1):
 			raise Exception('Would read over segment boundaries!')
 		return await self.current_segment.read(self.reader.file_handle, self.current_position - self.current_segment.start_address , t - self.current_segment.start_address)
 
@@ -177,7 +177,7 @@ async def read(self, size = -1):
 			return await self.current_segment.read(self.reader.file_handle, old_new_pos - self.current_segment.start_address, None)
 
 		t = self.current_position + size
-		if not self.current_segment.inrange(t):
+		if not self.current_segment.inrange(t - 1):
 			raise Exception('Would read over segment boundaries!')
 
 		old_new_pos = self.current_position