usb-dbg: fix postcode frame buffer overflow
Correctly limit to 10 pages, and display the latest codes.
Shorten the title to display the page number, also align with
fb-openbmc.
Change-Id: I8f6b0a2025310b037cf3b4e40078ceb6e47383f3
Signed-off-by: Cosmo Chou <cosmo.chou@quantatw.com>
diff --git a/src/usb-dbg.cpp b/src/usb-dbg.cpp
index 52dfa29..bb2052e 100644
--- a/src/usb-dbg.cpp
+++ b/src/usb-dbg.cpp
@@ -782,13 +782,20 @@
static int udbg_get_postcode(uint8_t, uint8_t page, uint8_t* next,
uint8_t* count, uint8_t* buffer)
{
+ // up to 70 codes can be displayed on 10 pages
+ static constexpr size_t maxPostcodes = 70;
+
+ static constexpr const char* formatStr =
+ (postCodeSize == 4) ? "{:08X}"
+ : (postCodeSize == 8) ? "{:016X}"
+ : "{:02X}";
+
if (page == 1)
{
// Initialize and clear frame (example initialization)
frame_postcode.init();
- snprintf(frame_postcode.title, 32, "Extra Post Code");
- frame_sel.overwrite = true;
- frame_sel.max_page = 5;
+ snprintf(frame_postcode.title, 32, "POST CODE");
+ frame_postcode.max_page = 10;
// Synchronously get D-Bus connection
auto bus = sdbusplus::bus::new_default();
@@ -810,15 +817,23 @@
std::vector<std::tuple<uint64_t, std::vector<uint8_t>>> postcodes;
reply.read(postcodes);
- // Insert retrieved postcodes into frame_postcode
- for (const auto& [code, extra] : postcodes)
+ // retrieve the latest postcodes
+ size_t numEntries = std::min(maxPostcodes, postcodes.size());
+ for (auto it = postcodes.rbegin();
+ it != postcodes.rbegin() + numEntries; ++it)
{
- std::string result = std::format("{:02x}", code);
+ const auto& [code, extra] = *it;
+ std::string result = std::format(formatStr, code);
for (const auto& byte : extra)
{
- result += std::format("{:02x}", byte);
+ result += std::format("{:02X}", byte);
}
+
frame_postcode.append(result);
+ if (frame_postcode.lines >= maxPostcodes)
+ {
+ break;
+ }
}
}
catch (const std::exception& e)