sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix cppcheck reports:

Browse Source 
[src/providers/ogr/qgsogrprovider.cpp:1071]: (error) Memory leak: oldlocale
[src/providers/ogr/qgsogrprovider.cpp:1268]: (error) Memory leak: oldlocale
[src/core/spatialite/spatialite.c:50598]: (error) Memory leak: reader
[tests/src/core/testqgscolorscheme.cpp:155]: (error) Memory leak: dummyScheme2
[src/core/spatialite/spatialite.c:40138]: (error) Memory leak: ln
This commit is contained in:
Julien Nabet 2014-12-29 17:22:31 +01:00 committed by Juergen E. Fischer
parent 5a1df4a2d5
commit e6561cec68
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/spatialite/spatialite.c
View File

@ -40130,9 +40130,9 @@ fnct_aux_join_segments (gaiaLinestringPtr ln1, gaiaLinestringPtr ln2,
double m; double m;
if (ln1->DimensionModel == GAIA_XY_Z) if (ln1->DimensionModel == GAIA_XY_Z)
ln = gaiaAllocLinestringXYZ (points); ln = gaiaAllocLinestringXYZ (points);
if (ln1->DimensionModel == GAIA_XY_M) else if (ln1->DimensionModel == GAIA_XY_M)
ln = gaiaAllocLinestringXYM (points); ln = gaiaAllocLinestringXYM (points);
if (ln1->DimensionModel == GAIA_XY_Z_M) else if (ln1->DimensionModel == GAIA_XY_Z_M)
ln = gaiaAllocLinestringXYZM (points); ln = gaiaAllocLinestringXYZM (points);
else else
ln = gaiaAllocLinestring (points); ln = gaiaAllocLinestring (points);
@ -50595,6 +50595,7 @@ gaiaTextReaderAlloc (const char *path, char field_separator,
if (reader->toUtf8 == (void *) 0) if (reader->toUtf8 == (void *) 0)
{ {
fclose (in); fclose (in);
free(reader);
return NULL; return NULL;
} }
reader->error = 0; reader->error = 0;

4
src/providers/ogr/qgsogrprovider.cpp
View File

@ -1067,6 +1067,8 @@ bool QgsOgrProvider::addFeature( QgsFeature& f )
OGR_F_Destroy( feature ); OGR_F_Destroy( feature );
setlocale( LC_NUMERIC, oldlocale ); setlocale( LC_NUMERIC, oldlocale );
if (oldlocale)
free(oldlocale);
return returnValue; return returnValue;
} }
@ -1265,6 +1267,8 @@ bool QgsOgrProvider::changeAttributeValues( const QgsChangedAttributesMap & attr
} }
setlocale( LC_NUMERIC, oldlocale ); setlocale( LC_NUMERIC, oldlocale );
if (oldlocale)
free(oldlocale);
} }
if ( OGR_L_SyncToDisk( ogrLayer ) != OGRERR_NONE ) if ( OGR_L_SyncToDisk( ogrLayer ) != OGRERR_NONE )

2
tests/src/core/testqgscolorscheme.cpp
View File

@ -152,6 +152,8 @@ void TestQgsColorScheme::clone()
QgsColorScheme* dummyScheme2 = dummyScheme->clone(); QgsColorScheme* dummyScheme2 = dummyScheme->clone();
QgsNamedColorList colors2 = dummyScheme2->fetchColors(); QgsNamedColorList colors2 = dummyScheme2->fetchColors();
QCOMPARE( colors, colors2 ); QCOMPARE( colors, colors2 );
delete dummyScheme;
delete dummyScheme2;
} }
QTEST_MAIN( TestQgsColorScheme ) QTEST_MAIN( TestQgsColorScheme )