diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-03-06 08:08:46 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-03-06 08:08:46 +0000 |
| commit | 36d24a217bf114f4bcfe1f41a74e4e39d786c43e (patch) | |
| tree | 9863e3c6563cbe0353a1659a813381c20b3191c1 /navit/maptool | |
| parent | 2e36403c890f207964ef2ad66edf2e0fd3bc41ad (diff) | |
| download | navit-svn-36d24a217bf114f4bcfe1f41a74e4e39d786c43e.tar.gz | |
Fix:maptool:Avoid core dumps when using -b option
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6020 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/maptool')
| -rw-r--r-- | navit/maptool/maptool.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/navit/maptool/maptool.c b/navit/maptool/maptool.c index 0efcf881..3fc47b68 100644 --- a/navit/maptool/maptool.c +++ b/navit/maptool/maptool.c @@ -944,26 +944,30 @@ int main(int argc, char **argv) if (p.process_relations && p.process_ways && p.process_nodes && start_phase(&p,"processing associated street relations")) { struct files_relation_processing *files_relproc = files_relation_processing_new(p.osm.line2poi, suffix); p.osm.associated_streets=tempfile(suffix,"associated_streets",0); + if (p.osm.associated_streets) { - process_associated_streets(p.osm.associated_streets, files_relproc); + process_associated_streets(p.osm.associated_streets, files_relproc); - fclose(p.osm.associated_streets); - files_relation_processing_destroy(files_relproc, suffix); - if(!p.keep_tmpfiles) { - tempfile_unlink(suffix,"associated_streets"); + fclose(p.osm.associated_streets); + files_relation_processing_destroy(files_relproc, suffix); + if(!p.keep_tmpfiles) { + tempfile_unlink(suffix,"associated_streets"); + } } } if (p.process_relations && p.process_ways && p.process_nodes && start_phase(&p,"processing house number interpolations")) { // OSM house number interpolations are handled like a relation. struct files_relation_processing *files_relproc = files_relation_processing_new(p.osm.line2poi, suffix); p.osm.house_number_interpolations=tempfile(suffix,"house_number_interpolations",0); + if (p.osm.house_number_interpolations) { - process_house_number_interpolations(p.osm.house_number_interpolations, files_relproc); + process_house_number_interpolations(p.osm.house_number_interpolations, files_relproc); - fclose(p.osm.house_number_interpolations); - files_relation_processing_destroy(files_relproc, suffix); - if(!p.keep_tmpfiles) { - tempfile_unlink(suffix,"house_number_interpolations"); + fclose(p.osm.house_number_interpolations); + files_relation_processing_destroy(files_relproc, suffix); + if(!p.keep_tmpfiles) { + tempfile_unlink(suffix,"house_number_interpolations"); + } } } if (p.output == 1 && start_phase(&p,"dumping")) { |