From 81ae37c58709cf1396b09e5136acfc8a0c259476 Mon Sep 17 00:00:00 2001 From: Burt P Date: Tue, 25 Jul 2017 14:33:49 -0500 Subject: device tree: fix crash when device tree is not found * check if device tree was found before add_keys() * UNKIFNULL(model) before strcmp * make UNKIFNULL() STRIFNULL() EMPIFNULL() macros more generic Signed-off-by: Burt P --- modules/devices/devicetree/pmac_data.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'modules/devices/devicetree/pmac_data.c') diff --git a/modules/devices/devicetree/pmac_data.c b/modules/devices/devicetree/pmac_data.c index 01b08419..b236aef1 100644 --- a/modules/devices/devicetree/pmac_data.c +++ b/modules/devices/devicetree/pmac_data.c @@ -58,14 +58,13 @@ static gchar *ppc_mac_details(void) { if (machine == NULL) goto pmd_exit; -#define _UNKIFNULL(STR) if (STR == NULL) { STR = strdup(_("(Unknown)")); } - _UNKIFNULL(platform); - _UNKIFNULL(model); - _UNKIFNULL(motherboard); - _UNKIFNULL(detected_as); - _UNKIFNULL(pmac_flags); - _UNKIFNULL(l2_cache); - _UNKIFNULL(pmac_gen); + UNKIFNULL(platform); + UNKIFNULL(model); + UNKIFNULL(motherboard); + UNKIFNULL(detected_as); + UNKIFNULL(pmac_flags); + UNKIFNULL(l2_cache); + UNKIFNULL(pmac_gen); ret = g_strdup_printf("[%s]\n" "%s=%s\n" -- cgit v1.2.3