[Bridge Example] Fix dangling pointer when AddDeviceEndpoint failed (#…

…33956) * Fix dandling pointer when AddDeviceEndpoint failed * Remove code never be excuted
project-chip · Sep 9, 2024 · 3ea5720 · 3ea5720
1 parent 516cec3
commit 3ea5720
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/examples/bridge-app/linux/main.cpp b/examples/bridge-app/linux/main.cpp
@@ -278,6 +278,7 @@ int AddDeviceEndpoint(Device * dev, EmberAfEndpointType * ep, const Span<const E
  }
  if (err != CHIP_ERROR_ENDPOINT_EXISTS)
  {
+ gDevices[index] = nullptr;
  return -1;
  }
  // Handle wrap condition

diff --git a/examples/fabric-bridge-app/linux/DeviceManager.cpp b/examples/fabric-bridge-app/linux/DeviceManager.cpp
@@ -161,6 +161,7 @@ int DeviceManager::AddDeviceEndpoint(Device * dev, chip::EndpointId parentEndpoi
  }
  if (err != CHIP_ERROR_ENDPOINT_EXISTS)
  {
+ mDevices[index] = nullptr;
  return -1; // Return error as endpoint addition failed due to an error other than endpoint already exists
  }
  // Increment the endpoint ID and handle wrap condition
@@ -171,6 +172,7 @@ int DeviceManager::AddDeviceEndpoint(Device * dev, chip::EndpointId parentEndpoi
  retryCount++;
  }
  ChipLogError(NotSpecified, "Failed to add dynamic endpoint after %d retries", kMaxRetries);
+ mDevices[index] = nullptr;
  return -1; // Return error as all retries are exhausted
  }
  index++;