--- a/messagingfw/msgsrvnstore/group/messaging_framework.history.xml Mon Mar 15 12:42:29 2010 +0200
+++ b/messagingfw/msgsrvnstore/group/messaging_framework.history.xml Wed Mar 31 22:25:10 2010 +0300
@@ -4,6 +4,10 @@
Framework for storage, retrieval, editing, sending and receiving of messages such as email or SMS.
</purpose>
+<defect number="SALM-82YBE9/DEF144617" title="The pointer cacheEntry alloacted on heap must be pushed onto CleanupStack before a leave function is invoked" " revision= "133">
+ Updated msvdbadapter.cpp to push and pop of CMsvCacheEntry in GetChildren() API .
+ </defect>
+
<defect number="PDEF142159/EHGO-7V4CS2 " title="A note is displayed after formatting Memory card when "Memory in use" " revision= "132">
Updated the Notification wrt DiskRemove and Disk Insert.
</defect>
--- a/messagingfw/msgsrvnstore/server/src/msvdbadapter.cpp Mon Mar 15 12:42:29 2010 +0200
+++ b/messagingfw/msgsrvnstore/server/src/msvdbadapter.cpp Wed Mar 31 22:25:10 2010 +0300
@@ -1239,6 +1239,7 @@
//Get the entry from the statement
aEntry = CMsvEntryFreePool::Instance()->EntryL();
+ CleanupStack::PushL(cacheEntry);
aEntry->Entry().iId = aId;
LoadEntryFromStatementL(getStmt, EGetEntry, aVisibleParentEntryId, *aEntry);
@@ -1283,7 +1284,8 @@
{
aEntry->Entry().iRelatedId = MaskTMsvId(driveId, aEntry->Entry().iRelatedId);
}
-
+
+ CleanupStack::Pop(cacheEntry);
CleanupStack::PopAndDestroy(2); //getStmt, queryBuf
}
@@ -1345,6 +1347,7 @@
TMsvId aVisibleParentEntryId;
CMsvCacheEntry *cacheEntry = CMsvEntryFreePool::Instance()->EntryL();
+ CleanupStack::PushL(cacheEntry);
if(!IsStandardId(aParentId))
{
aParentId = MaskTMsvId(driveId, aParentId);
@@ -1372,6 +1375,7 @@
//Add the child entry to the array given
aChildArray.AppendL(cacheEntry);
+ CleanupStack::Pop(cacheEntry);
}
CleanupStack::PopAndDestroy(2); //getStmt, queryBuf
@@ -1510,6 +1514,7 @@
}
CMsvCacheEntry* cacheEntry = CMsvEntryFreePool::Instance()->EntryL();
+ CleanupStack::PushL(cacheEntry);
if(!IsStandardId(aParentId))
{
aParentId = MaskTMsvId(driveId, aParentId);
@@ -1563,6 +1568,7 @@
//Add the child entry to the array given
aChildArray.AppendL(cacheEntry);
+ CleanupStack::Pop(cacheEntry);
}
CleanupStack::PopAndDestroy(2); // condGetChildrenStmnt,queryBuf
}
@@ -2404,9 +2410,10 @@
//Get the entry from the statement
aEntry = CMsvEntryFreePool::Instance()->EntryL();
+ CleanupStack::PushL(aEntry);
aEntry->Entry().iId = aId;
LoadEntryFromStatementL(iStatement[EGetEntry], EGetEntry, aVisibleParentEntryId, *aEntry);
-
+ CleanupStack::Pop(aEntry);
//Reset the RSqlStatement
User::LeaveIfError(iStatement[EGetEntry].Reset());
}
@@ -2432,10 +2439,12 @@
{
TMsvId aVisibleParentEntryId;
CMsvCacheEntry *cacheEntry = CMsvEntryFreePool::Instance()->EntryL();
+ CleanupStack::PushL(cacheEntry);
cacheEntry->Entry().iParentId = aParentId;
LoadEntryFromStatementL(iStatement[EGetChildEntries], EGetChildEntries, aVisibleParentEntryId, *cacheEntry);
//Add the child entry to the array given
aChildArray.AppendL(cacheEntry);
+ CleanupStack::Pop(cacheEntry);
}
//Reset the RSqlStatement
@@ -2511,6 +2520,7 @@
while(KSqlAtRow == condGetChildrenStmnt.Next())
{
CMsvCacheEntry* cacheEntry = CMsvEntryFreePool::Instance()->EntryL();
+ CleanupStack::PushL(cacheEntry);
cacheEntry->Entry().iParentId = aParentId;
index = 0;
@@ -2538,6 +2548,7 @@
//Add the child entry to the array given
aChildArray.AppendL(cacheEntry);
+ CleanupStack::Pop(cacheEntry);
}
CleanupStack::PopAndDestroy(2); // condGetChildrenStmnt,queryBuf
}
--- a/messagingfw/senduiservices/src/SendUiImpl.cpp Mon Mar 15 12:42:29 2010 +0200
+++ b/messagingfw/senduiservices/src/SendUiImpl.cpp Wed Mar 31 22:25:10 2010 +0300
@@ -1393,6 +1393,13 @@
aMessageData->AttachmentHandleArray(),
iCoeEnv->FsSession() );
cleanupItems += 2;
+
+ if ( attachments->Count() == 0 )
+ {
+ //there are no attachments, so no point in checking the file rights at all.
+ CleanupStack::PopAndDestroy( cleanupItems );
+ return ETrue;
+ }
}
fileRightsEngine->ConfirmDrmFileRightsL( attachments );
if ( attachments->Count() <= 0 )
--- a/messagingfw/wappushfw/pushutils/test/t_pushmessage.cpp Mon Mar 15 12:42:29 2010 +0200
+++ b/messagingfw/wappushfw/pushutils/test/t_pushmessage.cpp Wed Mar 31 22:25:10 2010 +0300
@@ -18,8 +18,8 @@
#include <s32file.h>
#include <push/pushmessage.h>
-#include "cmultipartbiniterator.h"
-#include "cmultiparttextiterator.h"
+#include <push/cmultipartbiniterator.h>
+#include <push/cmultiparttextiterator.h>
#include <push/pushlog.h>
#include "testlog.h"
--- a/messagingfw/wappushfw/pushutils/test/t_pushmessage.mmp Mon Mar 15 12:42:29 2010 +0200
+++ b/messagingfw/wappushfw/pushutils/test/t_pushmessage.mmp Wed Mar 31 22:25:10 2010 +0300
@@ -19,8 +19,10 @@
USERINCLUDE ./. ../inc ../../pushwatcher/inc
USERINCLUDE ../../pushwatcher/test
+
MW_LAYER_SYSTEMINCLUDE_SYMBIAN
-SYSTEMINCLUDE /epoc32/include/push
+
+
SOURCEPATH ./. ../src
SOURCE t_pushmessage.cpp
--- a/messagingfw/wappushfw/pushwatcher/src/ConnMan.cpp Mon Mar 15 12:42:29 2010 +0200
+++ b/messagingfw/wappushfw/pushwatcher/src/ConnMan.cpp Wed Mar 31 22:25:10 2010 +0300
@@ -14,7 +14,6 @@
//
#include <commdb.h>
-#include <iapprefs.h>
#include <wapmessage.h>
#include "ConnMan.h"
--- a/messagingfw/wappushfw/tpush/plugins/tpushapphandler/tpushapphandler.cpp Mon Mar 15 12:42:29 2010 +0200
+++ b/messagingfw/wappushfw/tpush/plugins/tpushapphandler/tpushapphandler.cpp Wed Mar 31 22:25:10 2010 +0300
@@ -19,7 +19,7 @@
#include <e32base.h>
#include <e32std.h>
#include <ecom/implementationproxy.h>
-#include "pushdispatcher.h"
+#include <push/pushdispatcher.h>
#include <push/pushlog.h>
#include <push/cpushhandlerbase.h>
#include <push/pluginkiller.h>
--- a/messagingfw/wappushfw/tpush/plugins/tpushapphandler/tpushapphandler.mmp Mon Mar 15 12:42:29 2010 +0200
+++ b/messagingfw/wappushfw/tpush/plugins/tpushapphandler/tpushapphandler.mmp Wed Mar 31 22:25:10 2010 +0300
@@ -31,7 +31,6 @@
UID 0x10009D8D 0x102822AB
VENDORID 0x70000001
MW_LAYER_SYSTEMINCLUDE_SYMBIAN
-SYSTEMINCLUDE /epoc32/include/push
USERINCLUDE ./.
--- a/messagingfw/wappushfw/tpush/t_wappush.mmp Mon Mar 15 12:42:29 2010 +0200
+++ b/messagingfw/wappushfw/tpush/t_wappush.mmp Wed Mar 31 22:25:10 2010 +0300
@@ -40,7 +40,10 @@
SOURCE t_slcmessage.cpp t_sicmessage.cpp
SOURCE t_invalDTDMessage.cpp
SOURCE t_DRMmessage.cpp
-SYSTEMRESOURCE wappushmtm.rss
+
+START RESOURCE wappushmtm.rss
+ TARGETPATH /system/data
+END
SOURCEPATH ../pushwatcher/src
SOURCE CLWatcher.cpp ConnMan.cpp
--- a/messagingfw/wappushfw/tpushscriptbased/t_wappushscriptbased.mmp Mon Mar 15 12:42:29 2010 +0200
+++ b/messagingfw/wappushfw/tpushscriptbased/t_wappushscriptbased.mmp Wed Mar 31 22:25:10 2010 +0300
@@ -37,7 +37,11 @@
SOURCE t_baseMessage.cpp wappushmsggen.cpp
SOURCE t_wappush.cpp
SOURCE t_sislmessage.cpp t_simessage.cpp t_slmessage.cpp
-SYSTEMRESOURCE wappushmtm.rss
+
+START RESOURCE wappushmtm.rss
+ TARGETPATH /system/data
+END
+
SOURCEPATH ../pushwatcher/src
SOURCE CLWatcher.cpp ConnMan.cpp