From d2b9957fab0eb7139c5a5c38b3ab409ffc1e7e6b Mon Sep 17 00:00:00 2001 From: Tom Englund Date: Sat, 28 Feb 2026 16:29:22 +0100 Subject: [PATCH] format: safeguard drmGetFormat functions (#13416) they can return null if not found. --- src/helpers/Format.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/helpers/Format.cpp b/src/helpers/Format.cpp index a4efb948..5c35b8ea 100644 --- a/src/helpers/Format.cpp +++ b/src/helpers/Format.cpp @@ -314,14 +314,22 @@ uint32_t NFormatUtils::glFormatToType(uint32_t gl) { } std::string NFormatUtils::drmFormatName(DRMFormat drm) { - auto n = drmGetFormatName(drm); + auto n = drmGetFormatName(drm); + + if (!n) + return "unknown"; + std::string name = n; free(n); // NOLINT(cppcoreguidelines-no-malloc,-warnings-as-errors) return name; } std::string NFormatUtils::drmModifierName(uint64_t mod) { - auto n = drmGetFormatModifierName(mod); + auto n = drmGetFormatModifierName(mod); + + if (!n) + return "unknown"; + std::string name = n; free(n); // NOLINT(cppcoreguidelines-no-malloc,-warnings-as-errors) return name;