Fix cppcheck reports:

serval2412 · jef-n · commit e6561cec68ea · 2014-12-30T22:47:08.000+01:00
[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
diff --git a/src/core/spatialite/spatialite.c b/src/core/spatialite/spatialite.c
@@ -40130,9 +40130,9 @@ fnct_aux_join_segments (gaiaLinestringPtr ln1, gaiaLinestringPtr ln2,
     double m;
     if (ln1->DimensionModel == GAIA_XY_Z)
 	ln = gaiaAllocLinestringXYZ (points);
-    if (ln1->DimensionModel == GAIA_XY_M)
+    else if (ln1->DimensionModel == GAIA_XY_M)
 	ln = gaiaAllocLinestringXYM (points);
-    if (ln1->DimensionModel == GAIA_XY_Z_M)
+    else if (ln1->DimensionModel == GAIA_XY_Z_M)
 	ln = gaiaAllocLinestringXYZM (points);
     else
 	ln = gaiaAllocLinestring (points);
@@ -50595,6 +50595,7 @@ gaiaTextReaderAlloc (const char *path, char field_separator,
     if (reader->toUtf8 == (void *) 0)
       {
 	  fclose (in);
+          free(reader);
 	  return NULL;
       }
     reader->error = 0;
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -1067,6 +1067,8 @@ bool QgsOgrProvider::addFeature( QgsFeature& f )
   OGR_F_Destroy( feature );
 
   setlocale( LC_NUMERIC, oldlocale );
+  if (oldlocale)
+    free(oldlocale);
 
   return returnValue;
 }
@@ -1265,6 +1267,8 @@ bool QgsOgrProvider::changeAttributeValues( const QgsChangedAttributesMap & attr
     }
 
     setlocale( LC_NUMERIC, oldlocale );
+    if (oldlocale)
+      free(oldlocale);
   }
 
   if ( OGR_L_SyncToDisk( ogrLayer ) != OGRERR_NONE )
diff --git a/tests/src/core/testqgscolorscheme.cpp b/tests/src/core/testqgscolorscheme.cpp
@@ -152,6 +152,8 @@ void TestQgsColorScheme::clone()
   QgsColorScheme* dummyScheme2 = dummyScheme->clone();
   QgsNamedColorList colors2 = dummyScheme2->fetchColors();
   QCOMPARE( colors, colors2 );
+  delete dummyScheme;
+  delete dummyScheme2;
 }
 
 QTEST_MAIN( TestQgsColorScheme )

Original file line number	Diff line number	Diff line change
`@@ -1067,6 +1067,8 @@ bool QgsOgrProvider::addFeature( QgsFeature& f )`
`1067`	`1067`	`OGR_F_Destroy( feature );`
`1068`	`1068`
`1069`	`1069`	`setlocale( LC_NUMERIC, oldlocale );`
	`1070`	`+ if (oldlocale)`
	`1071`	`+ free(oldlocale);`
`1070`	`1072`
`1071`	`1073`	`return returnValue;`
`1072`	`1074`	`}`
`@@ -1265,6 +1267,8 @@ bool QgsOgrProvider::changeAttributeValues( const QgsChangedAttributesMap & attr`
`1265`	`1267`	`}`
`1266`	`1268`
`1267`	`1269`	`setlocale( LC_NUMERIC, oldlocale );`
	`1270`	`+ if (oldlocale)`
	`1271`	`+ free(oldlocale);`
`1268`	`1272`	`}`
`1269`	`1273`
`1270`	`1274`	`if ( OGR_L_SyncToDisk( ogrLayer ) != OGRERR_NONE )`
Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,8 @@ void TestQgsColorScheme::clone()`
`152`	`152`	`QgsColorScheme* dummyScheme2 = dummyScheme->clone();`
`153`	`153`	`QgsNamedColorList colors2 = dummyScheme2->fetchColors();`
`154`	`154`	`QCOMPARE( colors, colors2 );`
	`155`	`+ delete dummyScheme;`
	`156`	`+ delete dummyScheme2;`
`155`	`157`	`}`
`156`	`158`
`157`	`159`	`QTEST_MAIN( TestQgsColorScheme )`