diff options
| author | Burt P <pburt0@gmail.com> | 2019-06-22 11:46:31 -0500 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2019-06-22 11:01:39 -0700 |
| commit | 1688414fce3fb33aa7169af751302c7c794e4a0e (patch) | |
| tree | 859ca7c7877cdc562f4e2f0ec4e4e11cf29e34d9 /modules/devices | |
| parent | c12d2d4b64548a0f5301f154d6eec1981cb66c9b (diff) | |
devices/dmi_memory.c: fix for <BAD INDEX> from dmidecode
Pango tries to use it as a tag and causes an error.
Signed-off-by: Burt P <pburt0@gmail.com>
Diffstat (limited to 'modules/devices')
| -rw-r--r-- | modules/devices/dmi_memory.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/modules/devices/dmi_memory.c b/modules/devices/dmi_memory.c index d6891573..c75cf403 100644 --- a/modules/devices/dmi_memory.c +++ b/modules/devices/dmi_memory.c @@ -62,6 +62,12 @@ gchar *dmi_mem_socket_info() { gchar *mfgr = dmidecode_match("Manufacturer", &dtm, &h); gchar *partno = dmidecode_match("Part Number", &dtm, &h); + if (g_str_has_prefix(mfgr, "<BAD INDEX>")) { + /* the manufacturer code is unknown to dmidecode */ + g_free(mfgr); + mfgr = NULL; + } + gchar *vendor_str = NULL; if (mfgr) { const gchar *v_url = vendor_get_url(mfgr); @@ -90,7 +96,7 @@ gchar *dmi_mem_socket_info() { _("Memory Socket"), i, locator, _("DMI Handle"), h, _("Form Factor"), UNKIFNULL2(form_factor), - _("Manufacturer"), UNKIFNULL2(mfgr), vendor_str, + _("Manufacturer"), UNKIFNULL2(mfgr), vendor_str ? vendor_str : "", _("Part Number"), UNKIFNULL2(partno), _("Type"), UNKIFNULL2(type), UNKIFNULL2(type_detail), _("Size"), UNKIFNULL2(size_str), |