Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Changes:

Bugfixes:
* Fixed libc version detection on FreeBSD without binutils installed, and on DragonFly BSD. (Libc, FreeBSD / DragonFly)
* Fixed CPU cache detection failing entirely when any CPU is offline. (#2736, CPUCache, Linux)

# 2.71.0

Expand Down
3 changes: 2 additions & 1 deletion src/detection/cpucache/cpucache_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,10 @@ const char* ffDetectCPUCache(FFCPUCacheResult* result) {
}

ffStrbufAppendS(&path, pathCpuEntry->d_name);
// Skip a CPU whose cache can't be read, e.g. an offline one: the kernel removes its `cache/`
const char* error = parseCpuCache(&path, result, &buffer, &added);
if (error) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just remove the early return, I think.

return error;
FF_DEBUG("Skipping \"%s\": %s", pathCpuEntry->d_name, error);
}
ffStrbufSubstrBefore(&path, baseLen);
}
Expand Down