Fix Crash when wildcard subscribe (#25676)

project-chip · Sep 11, 2023 · 1018798 · 1018798
1 parent 3501019
commit 1018798
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp
@@ -1378,7 +1378,11 @@ JNI_METHOD(void, subscribe)
     params.mIsFabricFiltered          = (isFabricFiltered != JNI_FALSE);
     params.mTimeout                   = imTimeoutMs != 0 ? System::Clock::Milliseconds32(imTimeoutMs) : System::Clock::kZero;
 
-    SuccessOrExit(err = JniReferences::GetInstance().GetListSize(attributePathList, numAttributePaths));
+    if (attributePathList != nullptr)
+    {
+        SuccessOrExit(err = JniReferences::GetInstance().GetListSize(attributePathList, numAttributePaths));
+    }
+
     if (numAttributePaths > 0)
     {
         std::unique_ptr<chip::app::AttributePathParams[]> attributePaths(new chip::app::AttributePathParams[numAttributePaths]);
@@ -1398,7 +1402,11 @@ JNI_METHOD(void, subscribe)
         attributePaths.release();
     }
 
-    SuccessOrExit(err = JniReferences::GetInstance().GetListSize(eventPathList, numEventPaths));
+    if (eventPathList != nullptr)
+    {
+        SuccessOrExit(err = JniReferences::GetInstance().GetListSize(eventPathList, numEventPaths));
+    }
+
     if (numEventPaths > 0)
     {
         std::unique_ptr<chip::app::EventPathParams[]> eventPaths(new chip::app::EventPathParams[numEventPaths]);