Keep assumptions in validity functions

Signed-off-by: Felipe R. Monteiro <[email protected]>

Author: feliperodri

test/cbmc/proofs/MQTT_DeserializeAck/MQTT_DeserializeAck_harness.c

@@ -35,7 +35,6 @@ void harness()
 
     pIncomingPacket = allocateMqttPacketInfo( NULL );
     __CPROVER_assume( isValidMqttPacketInfo( pIncomingPacket ) );
-    __CPROVER_assume( IMPLIES( pIncomingPacket != NULL, pIncomingPacket->remainingLength < REMAINING_LENGTH_MAX ) );
 
     /* These are allocated for coverage of a NULL input. */
     pPacketId = malloc( sizeof( uint16_t ) );

test/cbmc/sources/mqtt_cbmc_state.c

@@ -69,6 +69,11 @@ bool isValidMqttPacketInfo( const MQTTPacketInfo_t * pPacketInfo )
 {
     bool isValid = true;
 
+    if( pPacketInfo != NULL )
+    {
+        isValid = isValid && pPacketInfo->remainingLength < REMAINING_LENGTH_MAX;
+    }
+
     return isValid;
 }