mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

OSC: fixed bug where, if one OSCBundle contains multiple OSCBundles, the second nested bundle was not read correctly and an exception was thrown as a result.

Browse source
This commit is contained in:
Timur Doumler 2016-11-30 17:09:56 +00:00
parent 3945f1d29b
commit 92c219fda5
1 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
modules/juce_osc/osc/juce_OSCReceiver.cpp
View file

@ -210,8 +210,12 @@ namespace
}
//==============================================================================
OSCBundle readBundle()
OSCBundle readBundle (size_t maxBytesToRead = std::numeric_limits<size_t>::max())
{
// maxBytesToRead is only passed in here in case this bundle is a nested
// bundle, so we know when to consider the next element *not* part of this
// bundle anymore (but part of the outer bundle) and return.
if (input.getNumBytesRemaining() < 16)
throw OSCFormatError ("OSC input stream exhausted while reading bundle");
@ -220,9 +224,18 @@ namespace
OSCBundle bundle (readTimeTag());
while (! isExhausted())
size_t bytesRead = 16; // already read "#bundle" and timeTag
size_t pos = getPosition();
while (! isExhausted() && bytesRead < maxBytesToRead)
{
bundle.addElement (readElement());
const size_t newPos = getPosition();
bytesRead += newPos - pos;
pos = newPos;
}
return bundle;
}
@ -274,7 +287,9 @@ namespace
OSCBundle readBundleWithCheckedSize (size_t size)
{
const size_t begin = (size_t) getPosition();
OSCBundle bundle (readBundle());
const size_t maxBytesToRead = size - 4; // we've already read 4 bytes (the bundle size)
OSCBundle bundle (readBundle (maxBytesToRead));
if (getPosition() - begin != size)
throw OSCFormatError ("OSC input stream format error: wrong element content size encountered while reading");