Make QR code parsing error out if the padding bits are not all 0. (#1…

…8809) Right now we accept invalid QR codes with nonzero padding.
project-chip · Aug 2, 2022 · 1389372 · 1389372
1 parent 6d71e46
commit 1389372
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/setup_payload/QRCodeSetupPayloadParser.cpp b/src/setup_payload/QRCodeSetupPayloadParser.cpp
@@ -365,6 +365,11 @@ CHIP_ERROR QRCodeSetupPayloadParser::populatePayload(SetupPayload & outPayload)
     outPayload.setUpPINCode = static_cast<uint32_t>(dest);
 
     ReturnErrorOnFailure(readBits(buf, indexToReadFrom, dest, kPaddingFieldLengthInBits));
+    if (dest != 0)
+    {
+        ChipLogError(SetupPayload, "Payload padding bits are not all 0: 0x%x", static_cast<unsigned>(dest));
+        return CHIP_ERROR_INVALID_ARGUMENT;
+    }
 
     return populateTLV(outPayload, buf, indexToReadFrom);
 }