--- a/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPStream.cpp Thu Aug 19 10:16:25 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPStream.cpp Tue Aug 31 15:32:57 2010 +0300
@@ -230,13 +230,25 @@
delete iTestPayload160Bits;
delete iTestMKI128Bits;
delete iTestAuthTag80Bits;
+
+ iDecryptedPayload = NULL;
+ iTestPayload160Bits = NULL;
+ iTestMKI128Bits = NULL;
+ iTestAuthTag80Bits = NULL;
delete iStreamIn;
- delete iSRTPSession;
+ delete iSRTPSession;
+
+ iStreamIn = NULL;
+ iSRTPSession = NULL;
delete iRFC3711_SessionEncrKey128bits;
delete iRFC3711_SessionSaltKey128bits;
delete iRFC3711_SessionAuthKey128bits;
+
+ iRFC3711_SessionEncrKey128bits = NULL;
+ iRFC3711_SessionSaltKey128bits = NULL;
+ iRFC3711_SessionAuthKey128bits = NULL;
}
@@ -348,7 +360,7 @@
delete streamIn;
}
- void UT_CSRTPStream::UT_CSRTPStream_ReKeyNeeded_1L( )
+ void UT_CSRTPStream::UT_CSRTPStream_ReKeyNeeded_OneL( )
{
iReKeyCalled= EFalse;
CSRTPStreamIn* streamIn = CSRTPStreamIn::NewL(*iSRTPSession, (TUint)0);
@@ -357,7 +369,7 @@
delete streamIn;
}
-void UT_CSRTPStream::UT_CSRTPStream_ReKeyNeeded_2L( )
+void UT_CSRTPStream::UT_CSRTPStream_ReKeyNeeded_TwoL( )
{
iReKeyCalled= EFalse;
HBufC8* masterKey = HBufC8::NewL(KRFC3711_TestMasterKey128bits().Length());
@@ -432,13 +444,13 @@
"CSRTPStream",
"ReKey",
"FUNCTIONALITY",
- SetupL, UT_CSRTPStream_ReKeyNeeded_1L, Teardown)
+ SetupL, UT_CSRTPStream_ReKeyNeeded_OneL, Teardown)
EUNIT_TEST(
"ReKey2 ",
"CSRTPStream",
"ReKey",
"FUNCTIONALITY",
- SetupL, UT_CSRTPStream_ReKeyNeeded_2L, Teardown)
+ SetupL, UT_CSRTPStream_ReKeyNeeded_TwoL, Teardown)
EUNIT_TEST(
"TestNewL",