summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2018-03-28 16:12:45 +0200
committerNeels Hofmeyr <neels@hofmeyr.de>2018-03-28 16:19:00 +0200
commitd65f3ea18eb08925bec3afc169869ee1a2453c81 (patch)
treecf408c56c67bbcbb757c3298bb9ce50f4eb44490
parenta2501a20651bad1c1645547c8ad99af4f5c64e2e (diff)
vty/command.c: write_config_file(): sanely compose temp path
Fix GCC version 7.3.0 (Debian 7.3.0-12) compiler warning: ../../../../src/libosmocore/src/vty/command.c: In function ‘write_config_file’: ../../../../src/libosmocore/src/vty/command.c:2741:2: error: null destination pointer [-Werror=format-overflow=] sprintf(config_file_tmp, "%s.XXXXXX", config_file); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Check agains NULL after each _talloc_zero() in write_config_file(). While at it, add a comment explaining why we don't use talloc_asprintf() instead. Change-Id: I7bdc52afe724c1d21f419fe49a6e2ebca9420969
-rw-r--r--src/vty/command.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/vty/command.c b/src/vty/command.c
index 71f6a71e..24d8ea41 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -2728,16 +2728,26 @@ static int write_config_file(const char *config_file, char **outpath)
*outpath = NULL;
+ /* The string composition code here would be a case for talloc_asprintf(), but the pseudotalloc.c
+ * talloc_asprintf() implementation would truncate a too-long path with "[...]", so doing it
+ * manually instead. */
+
/* Check and see if we are operating under vtysh configuration */
config_file_sav =
_talloc_zero(tall_vty_cmd_ctx,
strlen(config_file) + strlen(CONF_BACKUP_EXT) + 1,
"config_file_sav");
+ if (!config_file_sav)
+ return -1;
strcpy(config_file_sav, config_file);
strcat(config_file_sav, CONF_BACKUP_EXT);
config_file_tmp = _talloc_zero(tall_vty_cmd_ctx, strlen(config_file) + 8,
- "config_file_tmp");
+ "config_file_tmp");
+ if (!config_file_tmp) {
+ talloc_free(config_file_sav);
+ return -1;
+ }
sprintf(config_file_tmp, "%s.XXXXXX", config_file);
/* Open file to configuration write. */