diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-05 09:55:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix layer name crash when reading from the standard input

Browse Source
This commit is contained in:
Eric Fischer
2015-03-25 14:07:34 -07:00
parent e95cc82678
commit fd8de691eb
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
geojson.c
+8 -4
View File
@@ -671,13 +671,17 @@ int read_json(int argc, char **argv, char *fname, const char *layername, int max
char *layernames[nlayers]; char *layernames[nlayers];
for (i = 0; i < nlayers; i++) { for (i = 0; i < nlayers; i++) {
if (argc == 1 && layername != NULL) { if (argc <= 1 && layername != NULL) {
layernames[i] = strdup(layername); layernames[i] = strdup(layername);
} else { } else {
char *trunc = layernames[i] = malloc(strlen(argv[i]) + 1); char *src = argv[i];
if (argc < 1) {
src = fname;
}
const char *ocp, *use = argv[i]; char *trunc = layernames[i] = malloc(strlen(src) + 1);
for (ocp = argv[i]; *ocp; ocp++) { const char *ocp, *use = src;
for (ocp = src; *ocp; ocp++) {
if (*ocp == '/' && ocp[1] != '\0') { if (*ocp == '/' && ocp[1] != '\0') {
use = ocp + 1; use = ocp + 1;
} }