Skip to content

Reject malformed OSC bundle element lengths #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
civilwarinfrance wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Reject malformed OSC bundle element lengths #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pythonosc/osc_bundle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ def _parse_contents(
while self._dgram[index:]:
# Get the sub content size.
content_size, index = osc_types.get_int(self._dgram, index)
if content_size <= 0 or content_size % 4:
raise ParseError(
"Invalid bundle element size: {}".format(content_size)
)
if content_size > len(self._dgram) - index:
raise ParseError("Bundle element exceeds the datagram length")
# Get the datagram for the sub content.
content_dgram = self._dgram[index : index + content_size]
# Increment our position index up to the next possible content.
Expand Down
23 changes: 21 additions & 2 deletions pythonosc/test/test_osc_bundle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
_DGRAM_BUNDLE_IN_BUNDLE = (
b"#bundle\x00"
b"\x00\x00\x00\x00\x00\x00\x00\x01"
b"\x00\x00\x00(" # length of sub bundle: 40 bytes.
b"\x00\x00\x00$" # length of sub bundle: 36 bytes.
b"#bundle\x00"
b"\x00\x00\x00\x00\x00\x00\x00\x01"
b"\x00\x00\x00\x10"
Expand All @@ -67,7 +67,7 @@
)

_DGRAM_UNKNOWN_TYPE = (
b"#bundle\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x10iamnotaslash"
b"#bundle\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x0ciamnotaslash"
)


Expand Down Expand Up @@ -118,6 +118,25 @@ def test_raises_on_invalid_datagram(self):
osc_bundle.ParseError, osc_bundle.OscBundle, _DGRAM_INVALID_INDEX
)

def test_rejects_oversized_element(self):
message = _DGRAM_SWITCH_GOES_ON[20:]
packet = _DGRAM_EMPTY_BUNDLE + osc_types.write_int(len(message) + 4) + message
with self.assertRaises(osc_bundle.ParseError):
osc_bundle.OscBundle(packet)

def test_rejects_invalid_element_lengths(self):
for size in (-2147483648, -8, -4, -1, 0, 1, 3, 5):
with self.subTest(size=size):
packet = _DGRAM_EMPTY_BUNDLE + osc_types.write_int(size) + b"abcd"
with self.assertRaises(osc_bundle.ParseError):
osc_bundle.OscBundle(packet)

def test_rejects_malformed_nested_element(self):
inner = _DGRAM_EMPTY_BUNDLE + osc_types.write_int(0)
packet = _DGRAM_EMPTY_BUNDLE + osc_types.write_int(len(inner)) + inner
with self.assertRaises(osc_bundle.ParseError):
osc_bundle.OscBundle(packet)

def test_unknown_type(self):
osc_bundle.OscBundle(_DGRAM_UNKNOWN_TYPE)

Expand Down