domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firmware-utils: fix segfault introduced by v2 changes

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

SVN-Revision: 37724
This commit is contained in:
John Crispin
2013-08-06 14:32:50 +00:00
parent f835cb6cc4
commit 815d9334e2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/firmware-utils/src/mktplinkfw.c
View File

@@ -811,7 +811,7 @@ static int build_fw(void)
int ret = EXIT_FAILURE; int ret = EXIT_FAILURE;
int writelen = 0; int writelen = 0;
int hdr_len; 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); hdr_len = sizeof(struct fw_header_v2);
else else
hdr_len = sizeof(struct fw_header); hdr_len = sizeof(struct fw_header);
@@ -854,7 +854,7 @@ static int build_fw(void)
if (!strip_padding) if (!strip_padding)
writelen = buflen; writelen = buflen;
if (board->hdr_version == HEADER_VERSION_V2) if (board && board->hdr_version == HEADER_VERSION_V2)
fill_header_v2(buf, writelen); fill_header_v2(buf, writelen);
else else
fill_header(buf, writelen); fill_header(buf, writelen);