diff --git a/Userland/Libraries/LibEDID/EDID.cpp b/Userland/Libraries/LibEDID/EDID.cpp index c343146eb9f..865d683c266 100644 --- a/Userland/Libraries/LibEDID/EDID.cpp +++ b/Userland/Libraries/LibEDID/EDID.cpp @@ -332,10 +332,13 @@ ErrorOr Parser::parse() } u16 packed_id = read_be(&raw_edid().vendor.manufacturer_id); + if (packed_id == 0x0) + return {}; m_legacy_manufacturer_id[0] = (char)((u16)'A' + ((packed_id >> 10) & 0x1f) - 1); m_legacy_manufacturer_id[1] = (char)((u16)'A' + ((packed_id >> 5) & 0x1f) - 1); m_legacy_manufacturer_id[2] = (char)((u16)'A' + (packed_id & 0x1f) - 1); m_legacy_manufacturer_id[3] = '\0'; + m_legacy_manufacturer_id_valid = true; return {}; } @@ -420,6 +423,8 @@ StringView Parser::legacy_manufacturer_id() const #ifndef KERNEL String Parser::manufacturer_name() const { + if (!m_legacy_manufacturer_id_valid) + return "Unknown"; auto manufacturer_id = legacy_manufacturer_id(); # ifdef ENABLE_PNP_IDS_DATA if (auto pnp_id_data = PnpIDs::find_by_manufacturer_id(manufacturer_id); pnp_id_data.has_value()) diff --git a/Userland/Libraries/LibEDID/EDID.h b/Userland/Libraries/LibEDID/EDID.h index 63a7f1a6160..6ccfc23aa05 100644 --- a/Userland/Libraries/LibEDID/EDID.h +++ b/Userland/Libraries/LibEDID/EDID.h @@ -457,6 +457,7 @@ private: String m_version; #endif char m_legacy_manufacturer_id[4] {}; + bool m_legacy_manufacturer_id_valid { false }; }; }