Skip to content

Commit 5c9297c

Browse files
authored
Merge pull request #452 from orgads/bad-xml-crash
Fix crash on invalid XML output
2 parents 1f6f5e4 + 734e8dc commit 5c9297c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/pyshark/tshark/tshark_xml.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def packet_from_xml_packet(xml_pkt, psml_structure=None):
2222
:return: Packet object.
2323
"""
2424
if not isinstance(xml_pkt, lxml.objectify.ObjectifiedElement):
25-
parser = lxml.objectify.makeparser(huge_tree=True)
25+
parser = lxml.objectify.makeparser(huge_tree=True, recover=True)
2626
xml_pkt = lxml.objectify.fromstring(xml_pkt, parser)
2727
if psml_structure:
2828
return _packet_from_psml_packet(xml_pkt, psml_structure)
@@ -39,4 +39,4 @@ def _packet_from_pdml_packet(pdml_packet):
3939
return Packet(layers=layers, frame_info=frame, number=geninfo.get_field_value('num'),
4040
length=geninfo.get_field_value('len'), sniff_time=geninfo.get_field_value('timestamp', raw=True),
4141
captured_length=geninfo.get_field_value('caplen'),
42-
interface_captured=frame.get_field_value('interface_id', raw=True))
42+
interface_captured=frame.get_field_value('interface_id', raw=True))

0 commit comments

Comments
 (0)