Fix the pos calculate wrong issue: #544

emqx · Aug 15, 2023 · 0b911e3 · 0b911e3
1 parent 111a860
commit 0b911e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Source/FramePublish.swift b/Source/FramePublish.swift
@@ -187,7 +187,7 @@ extension FramePublish: InitialWithBytes {
         if (protocolVersion == "5.0"){
             let data = MqttDecodePublish()
             data.decodePublish(fixedHeader: packetFixedHeaderType ,publishData: bytes)
-            pos += 1
+            pos = data.mqtt5DataIndex
 
             if(data.propertyLength != 0){
                 pos += data.propertyLength!

diff --git a/Source/MqttDecodePublish.swift b/Source/MqttDecodePublish.swift
@@ -35,7 +35,7 @@ public class MqttDecodePublish: NSObject {
     public var topic: String = ""
     //3.3.2.2 Packet Identifier
     public var packetIdentifier: UInt16?
-
+    public var mqtt5DataIndex = 0
 
 
     public func decodePublish(fixedHeader: UInt8, publishData: [UInt8]){
@@ -74,6 +74,7 @@ public class MqttDecodePublish: NSObject {
             let propertyLengthVariableByteInteger = decodeVariableByteInteger(data: publishData, offset: dataIndex)
             propertyLength = propertyLengthVariableByteInteger.res
             dataIndex = propertyLengthVariableByteInteger.newOffset
+            mqtt5DataIndex = propertyLengthVariableByteInteger.newOffset
 
             let occupyIndex = dataIndex