natas_hw
/
OSM-binary
mirror of https://github.com/openstreetmap/OSM-binary
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make osmpbf-outline more robust 

Add -g header for debugging.
Remove -O3 header because it led to a segfault on a corrupted PBF file in the fread() call. Strange!
Check result of ParseFromArray functions.
This commit is contained in:
Jochen Topf 2011-06-06 12:06:35 +02:00
parent 4d8a862cf9
commit 3479ac3f86
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/Makefile
View File

@ -1,6 +1,6 @@
CXX = g++
CXXFLAGS = -O3 -I../include
CXXFLAGS = -g -I../include
LDFLAGS = -L../src -lpthread -lz -lprotobuf-lite -losmpbf
all: osmpbf-outline

12
tools/osmpbf-outline.cpp
View File

@ -135,7 +135,8 @@ int main(int argc, char *argv[]) {
err("unable to read blob-header from file");
// parse the blob-header from the read-buffer
blobheader.ParseFromArray(buffer, sz);
if(!blobheader.ParseFromArray(buffer, sz))
err("unable to parse blob header");
// tell about the blob-header
info("\nBlobHeader (%d bytes)", sz);
@ -158,7 +159,8 @@ int main(int argc, char *argv[]) {
err("unable to read blob from file");
// parse the blob from the read-buffer
blob.ParseFromArray(buffer, sz);
if(!blob.ParseFromArray(buffer, sz))
err("unable to parse blob");
// tell about the blob-header
info("Blob (%d bytes)", sz);
@ -262,7 +264,8 @@ int main(int argc, char *argv[]) {
info(" OSMHeader");
// parse the HeaderBlock from the blob
headerblock.ParseFromArray(unpack_buffer, sz);
if(!headerblock.ParseFromArray(unpack_buffer, sz))
err("unable to parse header block");
// tell about the bbox
if(headerblock.has_bbox()) {
@ -296,7 +299,8 @@ int main(int argc, char *argv[]) {
info(" OSMData");
// parse the PrimitiveBlock from the blob
primblock.ParseFromArray(unpack_buffer, sz);
if(!primblock.ParseFromArray(unpack_buffer, sz))
err("unable to parse primitive block");
// tell about the block's meta info
debug(" granularity: %u", primblock.granularity());