Merge pull request #483 from robszewczyk/bug/misc-fixes

Bug/misc fixes

Author: robszewczyk

src/lib/profiles/data-management/Current/GenericTraitCatalogImpl.cpp

@@ -16,6 +16,7 @@
  *    limitations under the License.
  */
 
+#if WEAVE_CONFIG_DATA_MANAGEMENT_CLIENT_EXPERIMENTAL
 #include <map>
 #include <limits>
 #include <Weave/Profiles/data-management/Current/WdmManagedNamespace.h>
@@ -32,3 +33,4 @@ template class GenericTraitCatalogImpl<TraitDataSource>;
 }; // namespace Profiles
 }; // namespace Weave
 }; // namespace nl
+#endif

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
 

src/lib/profiles/data-management/Current/TraitData.cpp

@@ -91,16 +91,15 @@ WEAVE_ERROR UpdateDictionaryDirtyPathCut::CutPath(PropertyPathHandle aPathhandle
 WEAVE_ERROR TraitSchemaEngine::ParseTagString(const char * apTagString, char ** apEndptr, uint8_t & aParseRes) const
 {
     WEAVE_ERROR err = WEAVE_NO_ERROR;
-
+    unsigned long int tag;
     VerifyOrExit(apTagString != NULL, err = WEAVE_ERROR_INVALID_ARGUMENT);
     VerifyOrExit(*apTagString == '/', err = WEAVE_ERROR_INVALID_ARGUMENT);
 
     apTagString++;
-
-    aParseRes = strtoul(apTagString, apEndptr, 0);
+    tag = strtoul(apTagString, apEndptr, 0);
     VerifyOrExit(!(*apEndptr == apTagString || (**apEndptr != '\0' && **apEndptr != '/')), err = WEAVE_ERROR_INVALID_ARGUMENT);
-    VerifyOrExit(aParseRes < kContextTagMaxNum, err = WEAVE_ERROR_INVALID_TLV_TAG);
-
+    VerifyOrExit(tag < kContextTagMaxNum, err = WEAVE_ERROR_INVALID_TLV_TAG);
+    aParseRes = tag;
 exit:
     return err;
 }

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();