From 815d9334e2baaedae7a4b50ad5d968b105f231d8 Mon Sep 17 00:00:00 2001 From: John Crispin <john@openwrt.org> Date: Tue, 6 Aug 2013 14:32:50 +0000 Subject: [PATCH] firmware-utils: fix segfault introduced by v2 changes Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com> SVN-Revision: 37724 --- tools/firmware-utils/src/mktplinkfw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/firmware-utils/src/mktplinkfw.c b/tools/firmware-utils/src/mktplinkfw.c index 05e40c5daf..f6fdff4943 100644 --- a/tools/firmware-utils/src/mktplinkfw.c +++ b/tools/firmware-utils/src/mktplinkfw.c @@ -811,7 +811,7 @@ static int build_fw(void) int ret = EXIT_FAILURE; int writelen = 0; int hdr_len; - if (board->hdr_version == HEADER_VERSION_V2) + if (board && board->hdr_version == HEADER_VERSION_V2) hdr_len = sizeof(struct fw_header_v2); else hdr_len = sizeof(struct fw_header); @@ -854,7 +854,7 @@ static int build_fw(void) if (!strip_padding) writelen = buflen; - if (board->hdr_version == HEADER_VERSION_V2) + if (board && board->hdr_version == HEADER_VERSION_V2) fill_header_v2(buf, writelen); else fill_header(buf, writelen); -- GitLab