fix tnetstread crash found via fuzzing

This commit is contained in:
Maximilian Hils 2021-08-08 16:12:37 +02:00
parent ca1229d60f
commit fcec63eebc
2 changed files with 2 additions and 1 deletions

View File

@ -46,7 +46,7 @@ class FlowReader:
if mdata["type"] not in FLOW_TYPES:
raise exceptions.FlowReadException("Unknown flow type: {}".format(mdata["type"]))
yield FLOW_TYPES[mdata["type"]].from_state(mdata)
except (ValueError, TypeError) as e:
except (ValueError, TypeError, IndexError) as e:
if str(e) == "not a tnetstring: empty file":
return # Error is due to EOF
raise exceptions.FlowReadException("Invalid data format.")

View File

@ -11,6 +11,7 @@ from mitmproxy.io import FlowReader, tnetstring
class TestFlowReader:
@given(binary())
@example(b'51:11:12345678901#4:this,8:true!0:~,4:true!0:]4:\\x00,~}')
@example(b'0:')
def test_fuzz(self, data):
f = io.BytesIO(data)
reader = FlowReader(f)