Commit 2bc8ab68 by devttys0

Fixed string parsing bug in magic.py

parent d16c7493
...@@ -537,7 +537,7 @@ class Magic(object): ...@@ -537,7 +537,7 @@ class Magic(object):
dvalue = self.data[start:(start+tags['strlen'])] dvalue = self.data[start:(start+tags['strlen'])]
# Else, just terminate the string at the first newline, carriage return, or NULL byte # Else, just terminate the string at the first newline, carriage return, or NULL byte
else: else:
dvalue = self.data[start:end].split('\x00')[0].split('\r')[0].split('\r')[0] dvalue = self.data[start:end].split('\x00')[0].split('\r')[0].split('\n')[0]
# Non-wildcard strings have a known length, specified in the signature line # Non-wildcard strings have a known length, specified in the signature line
else: else:
dvalue = self.data[start:end] dvalue = self.data[start:end]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment