Fix for bytestring search results
This commit is contained in:
parent
0c3959efb0
commit
d3012ea16b
|
@ -266,7 +266,7 @@ def find_in_file(string, demo_files_dict, regex=False, verbose=False, window=Non
|
||||||
match_array = []
|
match_array = []
|
||||||
|
|
||||||
matched_str = matches.group(0).decode('utf-8')
|
matched_str = matches.group(0).decode('utf-8')
|
||||||
if not all(x in matched_str for x in ("b'", '==')):
|
if not all(x in matched_str for x in ("b'", '=')) and len(matched_str) < 500:
|
||||||
# safe to assume this is not a base64 string as it does not contain the proper ending
|
# safe to assume this is not a base64 string as it does not contain the proper ending
|
||||||
match_array.append(matches.group(0).decode('utf-8'))
|
match_array.append(matches.group(0).decode('utf-8'))
|
||||||
matched_dict[full_filename] = match_array
|
matched_dict[full_filename] = match_array
|
||||||
|
@ -277,11 +277,11 @@ def find_in_file(string, demo_files_dict, regex=False, verbose=False, window=Non
|
||||||
append_file = False
|
append_file = False
|
||||||
match_array = []
|
match_array = []
|
||||||
for match_ in matches:
|
for match_ in matches:
|
||||||
match_str = match_.group(0).decode('utf-8')
|
matched_str = match_.group(0).decode('utf-8')
|
||||||
if match_str:
|
if matched_str:
|
||||||
if len(match_str) < 500 and "==" not in match_str and "b'" not in match_str:
|
if not all(x in matched_str for x in ("b'", '=')) and len(matched_str) < 500:
|
||||||
match_array.append(match_str)
|
# if len(match_str) < 500 and "=" not in match_str and "b'" not in match_str:
|
||||||
if append_file is False:
|
match_array.append(matched_str)
|
||||||
append_file = True
|
append_file = True
|
||||||
if append_file:
|
if append_file:
|
||||||
file_list.append(file)
|
file_list.append(file)
|
||||||
|
|
Loading…
Reference in New Issue