From: Horst Kronstorfer <hkronsto@frequentis.com>
Date: Fri, 16 Dec 2011 23:33:10 +0000 (+0000)
Subject: common/cmd_nvedit.c: Fix size calculation in do_env_import()
X-Git-Tag: v2025.01-rc5-pxa1908~18283
X-Git-Url: http://git.dujemihanovic.xyz/html/static/git-logo.png?a=commitdiff_plain;h=d3f80c77ca92eaf1e7166f0c4fdcaafefc563277;p=u-boot.git

common/cmd_nvedit.c: Fix size calculation in do_env_import()

do_env_import() missed the final '\0' terminator when calculating the
size of an environment data block.  This led to an erroneous 'bad CRC,
import failed' message for a checksum protected environment (-c.)

Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
---

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index baaa513f6b..63afc82fe2 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -868,7 +868,7 @@ static int do_env_import(cmd_tbl_t *cmdtp, int flag,
 			printf("## Warning: Input data exceeds %d bytes"
 				" - truncated\n", MAX_ENV_SIZE);
 		}
-		++size;
+		size += 2;
 		printf("## Info: input data size = %zu = 0x%zX\n", size, size);
 	}