summaryrefslogtreecommitdiffstats
path: root/vespamalloc
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-05-11 13:28:48 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2018-05-11 13:28:48 +0000
commit747c384cb37d5d8cd7d77847af239d8ba5ee0c20 (patch)
tree2fae0d1d240893b85d6f456930e6c4de637c209d /vespamalloc
parentf1aada5dd73a6b360d045a2dd8ca313b1ec36946 (diff)
ensure that we have room for our strings.
Diffstat (limited to 'vespamalloc')
-rw-r--r--vespamalloc/src/vespamalloc/malloc/memorywatcher.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/vespamalloc/src/vespamalloc/malloc/memorywatcher.h b/vespamalloc/src/vespamalloc/malloc/memorywatcher.h
index e54f53c4ec1..2724badf3ef 100644
--- a/vespamalloc/src/vespamalloc/malloc/memorywatcher.h
+++ b/vespamalloc/src/vespamalloc/malloc/memorywatcher.h
@@ -232,7 +232,10 @@ const char *vespaHomeConf(char pathName[])
if (env != NULL) {
home = env;
}
- assert((strlen(home) + strlen(conf) + 1) < PATH_MAX);
+ if ((strlen(home) + strlen(conf) + 1) < PATH_MAX) {
+ fprintf(stderr, "size of home(%ld) + conf(%ld) is larger than %d\n", strlen(home), strlen(conf), PATH_MAX);
+ abort();
+ }
strcpy(pathName, home);
strcat(pathName, conf);
pathName[PATH_MAX - 1] = '\0';