* 100016: don't double free crypto contexts, and don't improperly copy CryptoSuiteDefinitions

daemon/src/audio/audiortp/audio_rtp_factory.cpp

@@ -50,10 +50,6 @@ AudioRtpFactory::AudioRtpFactory(SIPCall *ca) : rtpSession_(NULL),
 
 AudioRtpFactory::~AudioRtpFactory()
 {
-    AudioSrtpSession* srtpSession = dynamic_cast<AudioSrtpSession*>(rtpSession_);
-    if (srtpSession)
-        srtpSession->deleteCryptoContexts();
-
     delete rtpSession_;
 }
 

daemon/src/audio/audiortp/audio_srtp_session.cpp

@@ -262,7 +262,7 @@ void AudioSrtpSession::initializeRemoteCryptoContext()
 {
     DEBUG("AudioSrtp: Initialize remote crypto context");
 
-    CryptoSuiteDefinition crypto = sfl::CryptoSuites[remoteCryptoSuite_];
+    const CryptoSuiteDefinition &crypto = sfl::CryptoSuites[remoteCryptoSuite_];
 
     delete remoteCryptoCtx_;
     remoteCryptoCtx_ = new ost::CryptoContext(0x0,
@@ -285,7 +285,7 @@ void AudioSrtpSession::initializeLocalCryptoContext()
 {
     DEBUG("AudioSrtp: Initialize local crypto context");
 
-    CryptoSuiteDefinition crypto = sfl::CryptoSuites[localCryptoSuite_];
+    const CryptoSuiteDefinition &crypto = sfl::CryptoSuites[localCryptoSuite_];
 
     delete localCryptoCtx_;
     localCryptoCtx_ = new ost::CryptoContext(OutgoingDataQueue::getLocalSSRC(),
@@ -318,11 +318,4 @@ void AudioSrtpSession::restoreCryptoContext(ost::CryptoContext *localContext,
     setOutQueueCryptoContext(localCryptoCtx_);
 }
 
-void AudioSrtpSession::deleteCryptoContexts()
-{
-    delete remoteCryptoCtx_;
-    remoteCryptoCtx_ = 0;
-    delete localCryptoCtx_;
-    localCryptoCtx_ = 0;
-}
 }

daemon/src/audio/audiortp/audio_srtp_session.h

@@ -101,10 +101,6 @@ class AudioSrtpSession : public AudioSymmetricRtpSession {
          */
         void restoreCryptoContext(ost::CryptoContext *, ost::CryptoContext *);
 
-        /**
-         * Force deletion of the current crypto contexts.
-         */
-        void deleteCryptoContexts();
     private:
         NON_COPYABLE(AudioSrtpSession);