Merge branch 'master' into idm-4.2-troubleshoot

raul-marquez-csa · May 14, 2024 · af0084b · af0084b
2 parents cbbee32 + c7f7984
commit af0084b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 279 deletions.
diff --git a/examples/chip-tool/commands/common/Command.cpp b/examples/chip-tool/commands/common/Command.cpp
@@ -171,7 +171,7 @@ bool HandleNullableOptional(Argument & arg, char * argValue, std::function<bool(
     if (arg.isNullable())
     {
         auto * nullable = reinterpret_cast<chip::app::DataModel::Nullable<T> *>(arg.value);
-        if (strcmp(argValue, "null") == 0)
+        if (argValue != nullptr && strncmp(argValue, "null", 4) == 0)
         {
             nullable->SetNull();
             return true;

diff --git a/src/app/tests/suites/certification/Test_TC_ICDM_2_2.yaml b/src/app/tests/suites/certification/Test_TC_ICDM_2_2.yaml
diff --git a/src/app/tests/suites/manualTests.json b/src/app/tests/suites/manualTests.json
@@ -120,7 +120,6 @@
     "GeneralDiagnostics": ["Test_TC_DGGEN_2_2"],
     "Identify": ["Test_TC_I_3_2"],
     "IcdManagement": [
-        "Test_TC_ICDM_2_2",
         "Test_TC_ICDM_3_1",
         "Test_TC_ICDM_3_2",
         "Test_TC_ICDM_3_3",