fix: add missing nullptr check in adjustRootDeviceEnvironments method

Related-To: NEO-8166 Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com> Source: 16dd1eb
intel · Aug 4, 2023 · 4afb8cf · 4afb8cf
1 parent bd724de
commit 4afb8cf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/shared/source/execution_environment/execution_environment_drm_or_wddm.cpp b/shared/source/execution_environment/execution_environment_drm_or_wddm.cpp
@@ -14,7 +14,7 @@
 namespace NEO {
 
 void ExecutionEnvironment::adjustRootDeviceEnvironments() {
-    if (rootDeviceEnvironments[0]->osInterface->getDriverModel()->getDriverModelType() == DriverModelType::DRM) {
+    if (!rootDeviceEnvironments.empty() && rootDeviceEnvironments[0]->osInterface->getDriverModel()->getDriverModelType() == DriverModelType::DRM) {
         for (auto rootDeviceIndex = 0u; rootDeviceIndex < rootDeviceEnvironments.size(); rootDeviceIndex++) {
             auto drmMemoryOperationsHandler = static_cast<DrmMemoryOperationsHandler *>(rootDeviceEnvironments[rootDeviceIndex]->memoryOperationsInterface.get());
             drmMemoryOperationsHandler->setRootDeviceIndex(rootDeviceIndex);

diff --git a/shared/test/unit_test/os_interface/linux/device_factory_tests_linux.cpp b/shared/test/unit_test/os_interface/linux/device_factory_tests_linux.cpp
@@ -81,6 +81,7 @@ TEST(SortAndFilterDevicesDrmTest, whenSortingAndFilteringDevicesThenMemoryOperat
     DebugManager.flags.CreateMultipleRootDevices.set(numRootDevices);
     DebugManager.flags.ZE_AFFINITY_MASK.set("1,2,3,4,5");
 
+    VariableBackup<uint32_t> osContextCountBackup(&MemoryManager::maxOsContextCount);
     VariableBackup<std::map<std::string, std::vector<std::string>>> directoryFilesMapBackup(&directoryFilesMap);
     VariableBackup<const char *> pciDevicesDirectoryBackup(&Os::pciDevicesDirectory);
     VariableBackup<decltype(SysCalls::sysCallsOpen)> mockOpen(&SysCalls::sysCallsOpen, [](const char *pathname, int flags) -> int {
@@ -115,3 +116,17 @@ TEST(SortAndFilterDevicesDrmTest, whenSortingAndFilteringDevicesThenMemoryOperat
         EXPECT_EQ(rootDeviceIndex, static_cast<DrmMemoryOperationsHandlerBind &>(*executionEnvironment.rootDeviceEnvironments[rootDeviceIndex]->memoryOperationsInterface).getRootDeviceIndex());
     }
 }
+
+TEST(DeviceFactoryAffinityMaskTest, whenAffinityMaskDoesNotSelectAnyDeviceThenEmptyEnvironmentIsReturned) {
+    static const auto numRootDevices = 6;
+    DebugManagerStateRestore dbgRestorer;
+    DebugManager.flags.CreateMultipleRootDevices.set(numRootDevices);
+    DebugManager.flags.ZE_AFFINITY_MASK.set("100");
+
+    VariableBackup<uint32_t> osContextCountBackup(&MemoryManager::maxOsContextCount);
+    ExecutionEnvironment executionEnvironment{};
+    bool success = DeviceFactory::prepareDeviceEnvironments(executionEnvironment);
+    EXPECT_TRUE(success);
+
+    EXPECT_EQ(0u, executionEnvironment.rootDeviceEnvironments.size());
+}