Static analysis fixes

robszewczyk · robszewczyk · commit b84c9e875d07 · 2020-02-05T22:05:56.000-08:00
Change-Id: Ia4ae222821e19b655b13765ebe4b9a7451d71732
diff --git a/src/lib/profiles/data-management/Current/SubscriptionEngine.cpp b/src/lib/profiles/data-management/Current/SubscriptionEngine.cpp
@@ -1879,7 +1879,7 @@ WEAVE_ERROR SubscriptionEngine::ProcessUpdateRequestDataElement(Weave::TLV::TLVR
     if (err == WEAVE_ERROR_TLV_TAG_NOT_FOUND)
     {
         WeaveLogDetail(DataManagement, "Ignoring un-mappable path!");
-        err = WEAVE_NO_ERROR;
+        // no need to reset the value of err, it is set unconditionally below
     }
 #endif
 
diff --git a/src/lib/profiles/security/WeaveCertProvisioning.cpp b/src/lib/profiles/security/WeaveCertProvisioning.cpp
@@ -336,6 +336,7 @@ WEAVE_ERROR WeaveCertProvEngine::ProcessGetCertificateResponse(PacketBuffer * ms
         relatedCertsLen = writer.GetLengthWritten() - certLen;
 
         err = reader.Next();
+        VerifyOrExit(err == WEAVE_END_OF_TLV, err = WEAVE_ERROR_UNEXPECTED_TLV_ELEMENT);
     }
 
     err = reader.VerifyEndOfContainer();

Original file line number	Diff line number	Diff line change
`@@ -1879,7 +1879,7 @@ WEAVE_ERROR SubscriptionEngine::ProcessUpdateRequestDataElement(Weave::TLV::TLVR`
`1879`	`1879`	`if (err == WEAVE_ERROR_TLV_TAG_NOT_FOUND)`
`1880`	`1880`	`{`
`1881`	`1881`	`WeaveLogDetail(DataManagement, "Ignoring un-mappable path!");`
`1882`		`- err = WEAVE_NO_ERROR;`
	`1882`	`+ // no need to reset the value of err, it is set unconditionally below`
`1883`	`1883`	`}`
`1884`	`1884`	`#endif`
`1885`	`1885`
Original file line number	Diff line number	Diff line change
`@@ -336,6 +336,7 @@ WEAVE_ERROR WeaveCertProvEngine::ProcessGetCertificateResponse(PacketBuffer * ms`
`336`	`336`	`relatedCertsLen = writer.GetLengthWritten() - certLen;`
`337`	`337`
`338`	`338`	`err = reader.Next();`
	`339`	`+ VerifyOrExit(err == WEAVE_END_OF_TLV, err = WEAVE_ERROR_UNEXPECTED_TLV_ELEMENT);`
`339`	`340`	`}`
`340`	`341`
`341`	`342`	`err = reader.VerifyEndOfContainer();`