[Android] Fix CHIPTool cluster cmds fail or app crashes (Issue #15637)…

…. (#15919) * [Android] Fix CHIPTool cluster cmds fail or app crashes (Issue #15637). * [Android] Fix expression in verification instead of commenting out the verification. * Restyled by clang-format * [Android] Fix merge issue and revert un-necessary changes to verification expression Co-authored-by: Lisandre Taylor <lisandre.taylor@greenenergyoptions.co.uk> Co-authored-by: Restyled.io <commits@restyled.io>
project-chip · Mar 18, 2022 · 2fb3089 · 2fb3089
1 parent 1b1dd0c
commit 2fb3089
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/platform/android/DnssdImpl.cpp b/src/platform/android/DnssdImpl.cpp
@@ -44,7 +44,7 @@ jmethodID sPublishMethod        = nullptr;
 jmethodID sRemoveServicesMethod = nullptr;
 } // namespace
 
-// Implemention of functions declared in lib/dnssd/platform/Dnssd.h
+// Implementation of functions declared in lib/dnssd/platform/Dnssd.h
 
 CHIP_ERROR ChipDnssdInit(DnssdAsyncReturnCallback initCallback, DnssdAsyncReturnCallback errorCallback, void * context)
 {

diff --git a/src/platform/android/KeyValueStoreManagerImpl.cpp b/src/platform/android/KeyValueStoreManagerImpl.cpp
@@ -120,7 +120,7 @@ CHIP_ERROR KeyValueStoreManagerImpl::_Get(const char * key, void * value, size_t
         ChipLogError(DeviceLayer, "KeyValueStoreManager base64 decoding failed");
         return CHIP_ERROR_INTEGRITY_CHECK_FAILED;
     }
-    ReturnErrorCodeIf(offset_bytes >= decodedLength, CHIP_ERROR_INVALID_ARGUMENT);
+    ReturnErrorCodeIf(offset_bytes != 0 && offset_bytes >= decodedLength, CHIP_ERROR_INVALID_ARGUMENT);
     size_t read_size = std::min<size_t>(value_size, decodedLength - offset_bytes);
     if (value_size + offset_bytes < decodedLength)
     {