fix: support zero-length clientId

Ryan-CW-Code · Ryan-CW-Code · commit 3c245eff3a4b · 2025-10-22T09:39:22.000+08:00
diff --git a/source/core_mqtt_serializer.c b/source/core_mqtt_serializer.c
@@ -1706,12 +1706,7 @@ MQTTStatus_t MQTT_GetConnectPacketSize( const MQTTConnectInfo_t * pConnectInfo,
                     ( void * ) pPacketSize ) );
         status = MQTTBadParameter;
     }
-    else if( pConnectInfo->pClientIdentifier == NULL )
-    {
-        LogError( ( "Mqtt_GetConnectPacketSize() client identifier must be set." ) );
-        status = MQTTBadParameter;
-    }
-    else if( ( pConnectInfo->clientIdentifierLength == 0U ) && ( pConnectInfo->cleanSession == false ) )
+    else if( ( ( pConnectInfo->clientIdentifierLength == 0U ) || ( pConnectInfo->pClientIdentifier == NULL ) ) && ( pConnectInfo->cleanSession == false ) )
     {
         LogError( ( "Zero-length client identifier requires cleanSession=true per MQTT 3.1.1." ) );
         status = MQTTBadParameter;

Original file line number	Diff line number	Diff line change
`@@ -1706,12 +1706,7 @@ MQTTStatus_t MQTT_GetConnectPacketSize( const MQTTConnectInfo_t * pConnectInfo,`
`1706`	`1706`	`( void * ) pPacketSize ) );`
`1707`	`1707`	`status = MQTTBadParameter;`
`1708`	`1708`	`}`
`1709`		`- else if( pConnectInfo->pClientIdentifier == NULL )`
`1710`		`- {`
`1711`		`- LogError( ( "Mqtt_GetConnectPacketSize() client identifier must be set." ) );`
`1712`		`- status = MQTTBadParameter;`
`1713`		`- }`
`1714`		`- else if( ( pConnectInfo->clientIdentifierLength == 0U ) && ( pConnectInfo->cleanSession == false ) )`
	`1709`	`+ else if( ( ( pConnectInfo->clientIdentifierLength == 0U ) \|\| ( pConnectInfo->pClientIdentifier == NULL ) ) && ( pConnectInfo->cleanSession == false ) )`
`1715`	`1710`	`{`
`1716`	`1711`	`LogError( ( "Zero-length client identifier requires cleanSession=true per MQTT 3.1.1." ) );`
`1717`	`1712`	`status = MQTTBadParameter;`