diff options
| author | Sami Merila <sami.merila@nokia.com> | 2010-10-15 14:27:26 +0300 |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2010-10-15 14:27:26 +0300 |
| commit | 13bc1e0b99dd1d32bc0fef1dbdf0813ff5f4c66c (patch) | |
| tree | fa3ae3e8dc19dfdea28df2596319dd1513e554b0 /util | |
| parent | cc6bc2c286d2638f428f4d25f7eac00875578d3f (diff) | |
| download | qt4-tools-13bc1e0b99dd1d32bc0fef1dbdf0813ff5f4c66c.tar.gz | |
Make s60pixelmetrics harvester utility app more robust
There were some exceptional situations where the utility app
caused either a memory leak, or outright crashed.
Reviewed-by: TrustMe
Diffstat (limited to 'util')
| -rw-r--r-- | util/s60pixelmetrics/pm_mapperapp.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/util/s60pixelmetrics/pm_mapperapp.cpp b/util/s60pixelmetrics/pm_mapperapp.cpp index a88499da29..d68a0b0081 100644 --- a/util/s60pixelmetrics/pm_mapperapp.cpp +++ b/util/s60pixelmetrics/pm_mapperapp.cpp @@ -166,6 +166,7 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand ) else bufferPtr.Append(_L("screen.")); ShowL( *buffer, last ); + CleanupStack::PopAndDestroy( buffer ); } break; case ECmdStatus: @@ -257,7 +258,7 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand ) bufferPtr.Append(_L("Orientation cannot be changed.")); ShowL( *buffer, last ); bufferPtr.Zero(); - delete buffer; + CleanupStack::PopAndDestroy( buffer ); break; } #endif //__SERIES60_31__ @@ -278,7 +279,7 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand ) bufferPtr.Append(_L("Orientation changed.")); ShowL( *buffer, last ); bufferPtr.Zero(); - delete buffer; + CleanupStack::PopAndDestroy( buffer ); break; } case ECmdStartCalculations: @@ -787,11 +788,14 @@ void CPixelMetricsMapperAppUi::CreateHeaderFileL() const CleanupStack::PopAndDestroy(); //sourceFile } - bufferLayoutHdr = bufferLayoutHdr.Left(bufferLayoutHdr.Length()-2); - bufferPMData = bufferPMData.Left(bufferPMData.Length()-2); - textFile.Write(bufferLayoutHdr); - textFile.Write(KCRLF); - textFile.Write(bufferPMData); + if (fileCount > 0) + { + bufferLayoutHdr = bufferLayoutHdr.Left(bufferLayoutHdr.Length()-2); + bufferPMData = bufferPMData.Left(bufferPMData.Length()-2); + textFile.Write(bufferLayoutHdr); + textFile.Write(KCRLF); + textFile.Write(bufferPMData); + } delete dirList; CleanupStack::PopAndDestroy(); //file |