Browse Source

Fix the algorithm for decoding the remaining length to allow a length greater than 2,097,151 bytes.

See: https://docs.oasis-open.org/mqtt/mqtt/v3.1.1/errata01/os/mqtt-v3.1.1-errata01-os.html#_Toc442180732
release/3.x.x
kpreisser 6 years ago
parent
commit
88de5047bc
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      Frameworks/MQTTnet.NetStandard/Serializer/MqttPacketReader.cs

+ 2
- 2
Frameworks/MQTTnet.NetStandard/Serializer/MqttPacketReader.cs View File

@@ -86,7 +86,7 @@ namespace MQTTnet.Serializer


private static async Task<int> ReadBodyLengthFromSourceAsync(Stream stream, CancellationToken cancellationToken) private static async Task<int> ReadBodyLengthFromSourceAsync(Stream stream, CancellationToken cancellationToken)
{ {
// Alorithm taken from http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html.
// Alorithm taken from https://docs.oasis-open.org/mqtt/mqtt/v3.1.1/errata01/os/mqtt-v3.1.1-errata01-os-complete.html.
var multiplier = 1; var multiplier = 1;
var value = 0; var value = 0;
byte encodedByte; byte encodedByte;
@@ -110,11 +110,11 @@ namespace MQTTnet.Serializer
readBytes.Add(encodedByte); readBytes.Add(encodedByte);


value += (byte)(encodedByte & 127) * multiplier; value += (byte)(encodedByte & 127) * multiplier;
multiplier *= 128;
if (multiplier > 128 * 128 * 128) if (multiplier > 128 * 128 * 128)
{ {
throw new MqttProtocolViolationException($"Remaining length is invalid (Data={string.Join(",", readBytes)})."); throw new MqttProtocolViolationException($"Remaining length is invalid (Data={string.Join(",", readBytes)}).");
} }
multiplier *= 128;
} while ((encodedByte & 128) != 0); } while ((encodedByte & 128) != 0);


return value; return value;


Loading…
Cancel
Save