diff options
author | Burt P <pburt0@gmail.com> | 2017-07-25 14:33:49 -0500 |
---|---|---|
committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2017-07-25 19:02:32 -0700 |
commit | 81ae37c58709cf1396b09e5136acfc8a0c259476 (patch) | |
tree | f3e502ab9841dd0b1815ef4848d226cba87037ab /modules/devices/arm/processor.c | |
parent | 8e4746423c20b525671998b1bc94b3b6d8ec78d6 (diff) |
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 <pburt0@gmail.com>
Diffstat (limited to 'modules/devices/arm/processor.c')
-rw-r--r-- | modules/devices/arm/processor.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/modules/devices/arm/processor.c b/modules/devices/arm/processor.c index aef683b9..24c99812 100644 --- a/modules/devices/arm/processor.c +++ b/modules/devices/arm/processor.c @@ -138,19 +138,19 @@ processor_scan(void) processor = (Processor *) pi->data; /* strings can't be null or segfault later */ - STRIFNULL(model_name, _("ARM Processor") ); - EMPIFNULL(flags); - UNKIFNULL(cpu_implementer); - UNKIFNULL(cpu_architecture); - UNKIFNULL(cpu_variant); - UNKIFNULL(cpu_part); - UNKIFNULL(cpu_revision); + STRIFNULL(processor->model_name, _("ARM Processor") ); + EMPIFNULL(processor->flags); + UNKIFNULL(processor->cpu_implementer); + UNKIFNULL(processor->cpu_architecture); + UNKIFNULL(processor->cpu_variant); + UNKIFNULL(processor->cpu_part); + UNKIFNULL(processor->cpu_revision); processor->decoded_name = arm_decoded_name( processor->cpu_implementer, processor->cpu_part, processor->cpu_variant, processor->cpu_revision, processor->cpu_architecture, processor->model_name); - UNKIFNULL(decoded_name); + UNKIFNULL(processor->decoded_name); /* topo & freq */ processor->cpufreq = cpufreq_new(processor->id); |