#8725: Replace malloc by OGRMalloc

ahuarte47 · ahuarte47 · commit 2f35a7b40445 · 2013-11-13T17:23:59.000+01:00
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -310,7 +310,7 @@ void QgsOgrFeatureIterator::notifyLoadedFeature( OGRFeatureH fet, QgsFeature& fe
 QgsOgrSimplifiedFeatureIterator::QgsOgrSimplifiedFeatureIterator( QgsOgrProvider* p, const QgsFeatureRequest& request ) : QgsOgrFeatureIterator( p, request )
 {
   mPointBufferCount = 512;
-  mPointBufferPtr = (OGRRawPoint*)malloc( mPointBufferCount * sizeof(OGRRawPoint) );
+  mPointBufferPtr = (OGRRawPoint*)OGRMalloc( mPointBufferCount * sizeof(OGRRawPoint) );
 }
 QgsOgrSimplifiedFeatureIterator::~QgsOgrSimplifiedFeatureIterator( )
 {
@@ -332,7 +332,7 @@ OGRRawPoint* QgsOgrSimplifiedFeatureIterator::mallocPoints( int numPoints )
   if ( mPointBufferPtr==NULL )
   {
     mPointBufferCount = numPoints;
-    mPointBufferPtr = (OGRRawPoint*)malloc( mPointBufferCount * sizeof(OGRRawPoint) );
+    mPointBufferPtr = (OGRRawPoint*)OGRMalloc( mPointBufferCount * sizeof(OGRRawPoint) );
   }
   return mPointBufferPtr;
 }

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ void QgsOgrFeatureIterator::notifyLoadedFeature( OGRFeatureH fet, QgsFeature& fe`
`310`	`310`	`QgsOgrSimplifiedFeatureIterator::QgsOgrSimplifiedFeatureIterator( QgsOgrProvider* p, const QgsFeatureRequest& request ) : QgsOgrFeatureIterator( p, request )`
`311`	`311`	`{`
`312`	`312`	`mPointBufferCount = 512;`
`313`		`- mPointBufferPtr = (OGRRawPoint)malloc( mPointBufferCount sizeof(OGRRawPoint) );`
	`313`	`+ mPointBufferPtr = (OGRRawPoint)OGRMalloc( mPointBufferCount sizeof(OGRRawPoint) );`
`314`	`314`	`}`
`315`	`315`	`QgsOgrSimplifiedFeatureIterator::~QgsOgrSimplifiedFeatureIterator( )`
`316`	`316`	`{`
`@@ -332,7 +332,7 @@ OGRRawPoint* QgsOgrSimplifiedFeatureIterator::mallocPoints( int numPoints )`
`332`	`332`	`if ( mPointBufferPtr==NULL )`
`333`	`333`	`{`
`334`	`334`	`mPointBufferCount = numPoints;`
`335`		`- mPointBufferPtr = (OGRRawPoint)malloc( mPointBufferCount sizeof(OGRRawPoint) );`
	`335`	`+ mPointBufferPtr = (OGRRawPoint)OGRMalloc( mPointBufferCount sizeof(OGRRawPoint) );`
`336`	`336`	`}`
`337`	`337`	`return mPointBufferPtr;`
`338`	`338`	`}`