FCL/sf/mw/mmappfw: comparison mmappcomponents/mmmtpdataprovider/src/mmmtpdputility.cpp

equal deleted inserted replaced

-:91d5ad76f5c6
+:16db3449d7ba
 {
 // 3GP
 if ( mime->CompareF( KMimeTypeAudio3gpp ) == 0
 || mime->CompareF( KMimeTypeVideo3gpp ) == 0 )
 {
+delete mime;
+mime = NULL;
 format = EMTPFormatCode3GPContainer;
 }
+}
+if ( mime != NULL )
+{
 delete mime;
 mime = NULL;
 }
 }
 #ifdef MMMTPDP_ABSTRACTAUDIOALBUM_SUPPORT
 // -----------------------------------------------------------------------------
 //
 HBufC8* MmMtpDpUtility::OdfMimeTypeL( const TDesC& aFullPath )
 {
 PRINT( _L( "MM MTP => MmMtpDpUtility::OdfMimeTypeL" ) );
+HBufC8* mimebuf = NULL;
-CContent* content = CContent::NewLC( aFullPath ); // + content
-HBufC* buffer = HBufC::NewLC( KMimeTypeMaxLength ); // + buffer
+CContent* content = CContent::NewL( aFullPath );
+CleanupStack::PushL( content ); // + content
+HBufC* buffer = HBufC::NewL( KMimeTypeMaxLength );
+CleanupStack::PushL( buffer ); // + buffer
 TPtr data = buffer->Des();
-User::LeaveIfError( content->GetStringAttribute( EMimeType, data ) );
+TInt err = content->GetStringAttribute( EMimeType, data );
-HBufC8* mimebuf = HBufC8::NewL( buffer->Length() );
+if ( err == KErrNone )
-mimebuf->Des().Copy( *buffer );
+{
+mimebuf = HBufC8::New( buffer->Length() );
+if ( mimebuf == NULL )
+{
+User::LeaveIfError( KErrNotFound );
+}
+mimebuf->Des().Copy( *buffer );
+}
+// leave if NULL
+if ( mimebuf == NULL )
+{
+User::Leave( KErrNotFound );
+}
 CleanupStack::PopAndDestroy( buffer ); // - buffer
 CleanupStack::PopAndDestroy( content ); // - content
 PRINT( _L( "MM MTP <= MmMtpDpUtility::OdfMimeTypeL" ) );

branch	RCL_3
changeset 67	16db3449d7ba
parent 53	e42293e811d8