Guard against trying to map an empty string pool into memory

This commit is contained in:
Eric Fischer
2015-12-22 14:27:38 -08:00
parent a8b39aa2ff
commit ca4d1beb7c
+7 -4
View File
@@ -1633,10 +1633,13 @@ int read_json(int argc, char **argv, char *fname, const char *layername, int max
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
char *stringpool = (char *) mmap(NULL, poolpos, PROT_READ, MAP_PRIVATE, poolfd, 0); char *stringpool = NULL;
if (stringpool == MAP_FAILED) { if (poolpos > 0) { // Will be 0 if -X was specified
perror("mmap string pool"); stringpool = (char *) mmap(NULL, poolpos, PROT_READ, MAP_PRIVATE, poolfd, 0);
exit(EXIT_FAILURE); if (stringpool == MAP_FAILED) {
perror("mmap string pool");
exit(EXIT_FAILURE);
}
} }
unsigned midx = 0, midy = 0; unsigned midx = 0, midy = 0;