[U-Boot] [PATCH] tools: env: fix config file loading in env library

[U-Boot] [PATCH] tools: env: fix config file loading in env library

[Anatolij Gustschin]

env library is broken as the config file pointer is only initialized
in main(). When running in the env library parse_config() fails:

  Cannot parse config file '(null)': Bad address

Ensure that config file pointer is always initialized.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
---
 tools/env/fw_env.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
index 1420ac5..06cf63d 100644
--- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c
@@ -1325,6 +1325,9 @@ static int parse_config ()
 	struct stat st;
 
 #if defined(CONFIG_FILE)
+	if (!common_args.config_file)
+		common_args.config_file = CONFIG_FILE;
+
 	/* Fills in DEVNAME(), ENVSIZE(), DEVESIZE(). Or don't. */
 	if (get_config(common_args.config_file)) {
 		fprintf(stderr, "Cannot parse config file '%s': %m\n",
-- 
1.7.9.5

[U-Boot] tools: env: fix config file loading in env library

[Tom Rini]

On Fri, Apr 29, 2016 at 10:00:11PM +0200, Anatolij Gustschin wrote:

> env library is broken as the config file pointer is only initialized
> in main(). When running in the env library parse_config() fails:
> 
>   Cannot parse config file '(null)': Bad address
> 
> Ensure that config file pointer is always initialized.
> 
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> Cc: Stefano Babic <sbabic@denx.de>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160502/f1a99cfc/attachment.sig>

[U-Boot] [PATCH] tools: env: fix config file loading in env library

[Stefano Babic]

On 29/04/2016 22:00, Anatolij Gustschin wrote:
> env library is broken as the config file pointer is only initialized
> in main(). When running in the env library parse_config() fails:
> 
>   Cannot parse config file '(null)': Bad address
> 
> Ensure that config file pointer is always initialized.
> 
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> Cc: Stefano Babic <sbabic@denx.de>
> ---
>  tools/env/fw_env.c |    3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
> index 1420ac5..06cf63d 100644
> --- a/tools/env/fw_env.c
> +++ b/tools/env/fw_env.c
> @@ -1325,6 +1325,9 @@ static int parse_config ()
>  	struct stat st;
>  
>  #if defined(CONFIG_FILE)
> +	if (!common_args.config_file)
> +		common_args.config_file = CONFIG_FILE;
> +
>  	/* Fills in DEVNAME(), ENVSIZE(), DEVESIZE(). Or don't. */
>  	if (get_config(common_args.config_file)) {
>  		fprintf(stderr, "Cannot parse config file '%s': %m\n",
> 

Reviewed-by : Stefano Babic <sbabic@denx.de>

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================