diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-05-11 12:41:32 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2018-05-11 12:41:32 +0000 |
commit | c2b778e89481420295e6c1d134613d5ad711e2f6 (patch) | |
tree | ffe889a62c1421e5e02bf7ac2a2f6992f4f70618 /vespamalloc/src | |
parent | 9d969aa4a9f2b4481a16f44c9e7314f681adfb4d (diff) |
Using an assert instead of using strnxxx.
Diffstat (limited to 'vespamalloc/src')
-rw-r--r-- | vespamalloc/src/vespamalloc/malloc/memorywatcher.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vespamalloc/src/vespamalloc/malloc/memorywatcher.h b/vespamalloc/src/vespamalloc/malloc/memorywatcher.h index 3d9defc6b74..e54f53c4ec1 100644 --- a/vespamalloc/src/vespamalloc/malloc/memorywatcher.h +++ b/vespamalloc/src/vespamalloc/malloc/memorywatcher.h @@ -227,12 +227,14 @@ namespace { const char *vespaHomeConf(char pathName[]) { const char *home = "/opt/vespa"; + const char *conf = "/etc/vespamalloc.conf"; const char *env = getenv("VESPA_HOME"); if (env != NULL) { home = env; } - strncpy(pathName, home, PATH_MAX-1); - strncat(pathName, "/etc/vespamalloc.conf", PATH_MAX-1 -strlen(pathName)); + assert((strlen(home) + strlen(conf) + 1) < PATH_MAX); + strcpy(pathName, home); + strcat(pathName, conf); pathName[PATH_MAX - 1] = '\0'; return pathName; } |