Skip to content

Commit ed79d12

Browse files
author
jef
committed
use array delete operator on geometry
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9207 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 6eb7eb3 commit ed79d12

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/core/qgsgeometry.cpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ void throwGEOSException( const char *fmt, ... )
7474
vsnprintf( msg, buflen + 1, fmt, ap );
7575
va_end( ap );
7676

77+
QgsDebugMsg( QString( "GEOS exception encountered: " ).arg( msg ) );
78+
7779
throw GEOSException( msg );
7880
}
7981

@@ -628,7 +630,7 @@ void QgsGeometry::setGeos( GEOSGeometry* geos )
628630
}
629631
if ( mGeometry )
630632
{
631-
delete mGeometry;
633+
delete [] mGeometry;
632634
mGeometry = 0;
633635
}
634636

@@ -1756,7 +1758,7 @@ bool QgsGeometry::deleteVertexAt( int atVertex )
17561758
}
17571759
if ( success )
17581760
{
1759-
delete mGeometry;
1761+
delete [] mGeometry;
17601762
mGeometry = newbuffer;
17611763
mGeometrySize -= ( 2 * sizeof( double ) );
17621764
if ( hasZValue )
@@ -2060,7 +2062,7 @@ bool QgsGeometry::insertVertexBefore( double x, double y, int beforeVertex )
20602062

20612063
if ( success )
20622064
{
2063-
delete mGeometry;
2065+
delete [] mGeometry;
20642066
mGeometry = newbuffer;
20652067
mGeometrySize += 2 * sizeof( double );
20662068
if ( hasZValue )
@@ -4531,7 +4533,7 @@ bool QgsGeometry::convertToMultiType()
45314533
//copy the existing single geometry
45324534
memcpy( &newGeometry[currentWkbPosition], mGeometry, mGeometrySize );
45334535

4534-
delete mGeometry;
4536+
delete [] mGeometry;
45354537
mGeometry = newGeometry;
45364538
mGeometrySize = newGeomSize;
45374539
mDirtyGeos = true;

0 commit comments

Comments
 (0)