From: blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 6 Aug 2013 14:32:50 +0000 (+0000)
Subject: firmware-utils: fix segfault introduced by v2 changes
X-Git-Tag: fast2504n-3.10.28-merged~1669
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=8acf2418584456bac73369ccb27bb012887bdef8;p=openwrt.git

firmware-utils: fix segfault introduced by v2 changes

Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37724 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

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);