fly/terragear
1
0
Fork 0
Code Activity

Remove handle ( and memory ) leak

Browse source
This commit is contained in:
cvs 2006-03-25 14:16:56 +00:00
parent 0ffcbd97aa
commit 81656fd423
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Prep/ShapeFile/shape-decode.cxx
View file

@ -548,6 +548,7 @@ int main( int argc, char **argv ) {
if (psShape->nSHPType==0) { if (psShape->nSHPType==0) {
SG_LOG( SG_GENERAL, SG_DEBUG, "Skipping NULL record " << i); SG_LOG( SG_GENERAL, SG_DEBUG, "Skipping NULL record " << i);
SHPDestroyObject( psShape );
continue; continue;
} }
@ -559,9 +560,10 @@ int main( int argc, char **argv ) {
SG_LOG( SG_GENERAL, SG_ALERT, SG_LOG( SG_GENERAL, SG_ALERT,
"Record with negative part count, " "Record with negative part count, "
"file may be corrupted!"); "file may be corrupted!");
if (continue_on_errors) if (continue_on_errors) {
SHPDestroyObject( psShape );
continue; continue;
else } else
exit(-1); exit(-1);
} }
@ -573,9 +575,10 @@ int main( int argc, char **argv ) {
SG_LOG( SG_GENERAL, SG_ALERT, SG_LOG( SG_GENERAL, SG_ALERT,
"Non-point record with zero part count, " "Non-point record with zero part count, "
"file may be corrupted!"); "file may be corrupted!");
if (continue_on_errors) if (continue_on_errors) {
SHPDestroyObject( psShape );
continue; continue;
else } else
exit(-1); exit(-1);
} }
@ -621,6 +624,7 @@ int main( int argc, char **argv ) {
// Ocean data now comes from GSHHS so we want to ignore // Ocean data now comes from GSHHS so we want to ignore
// all other ocean data // all other ocean data
SHPDestroyObject( psShape );
continue; continue;
} else if ( area == VoidArea ) { } else if ( area == VoidArea ) {
// interior is ???? // interior is ????
@ -632,7 +636,7 @@ int main( int argc, char **argv ) {
SG_LOG( SG_GENERAL, SG_ALERT, " Void area with holes!" ); SG_LOG( SG_GENERAL, SG_ALERT, " Void area with holes!" );
// exit(-1); // exit(-1);
} }
SHPDestroyObject( psShape );
continue; continue;
} else if ( area == NullArea ) { } else if ( area == NullArea ) {
// interior is ???? // interior is ????
@ -644,7 +648,7 @@ int main( int argc, char **argv ) {
SG_LOG( SG_GENERAL, SG_ALERT, " Null area with holes!" ); SG_LOG( SG_GENERAL, SG_ALERT, " Null area with holes!" );
// exit(-1); // exit(-1);
} }
SHPDestroyObject( psShape );
continue; continue;
} }