diff --git a/pkgs/by-name/on/onetbb/fix-hwloc-nullptr-deref.patch b/pkgs/by-name/on/onetbb/fix-hwloc-nullptr-deref.patch new file mode 100644 index 000000000000..65b69293e155 --- /dev/null +++ b/pkgs/by-name/on/onetbb/fix-hwloc-nullptr-deref.patch @@ -0,0 +1,15 @@ +diff --git a/src/tbbbind/tbb_bind.cpp b/src/tbbbind/tbb_bind.cpp +index 26fa6747..2adccea5 100644 +--- a/src/tbbbind/tbb_bind.cpp ++++ b/src/tbbbind/tbb_bind.cpp +@@ -268,7 +268,9 @@ private: + // this function calls the interface that is available in the HWLOC 2.5 only. + #if HWLOC_API_VERSION >= 0x20500 + auto some_core = hwloc_get_next_obj_by_type(topology, HWLOC_OBJ_CORE, nullptr); +- hwloc_get_obj_with_same_locality(topology, some_core, HWLOC_OBJ_CORE, nullptr, nullptr, 0); ++ if (some_core) { ++ hwloc_get_obj_with_same_locality(topology, some_core, HWLOC_OBJ_CORE, nullptr, nullptr, 0); ++ } + #endif + } + diff --git a/pkgs/by-name/on/onetbb/package.nix b/pkgs/by-name/on/onetbb/package.nix index 3ab06b8bc1f7..bf9ed333195e 100644 --- a/pkgs/by-name/on/onetbb/package.nix +++ b/pkgs/by-name/on/onetbb/package.nix @@ -44,6 +44,9 @@ stdenv.mkDerivation (finalAttrs: { # # ./fix-libtbbmalloc-dlopen.patch + + # + ./fix-hwloc-nullptr-deref.patch ]; nativeBuildInputs = [