From fd8c36ce857902d34474dcda12d0ed78a63a9e61 Mon Sep 17 00:00:00 2001
From: Luminous Luminos <luminous@alchemyviewer.org>
Date: Mon, 3 Oct 2016 21:15:53 -0500
Subject: [PATCH] copy shared pointer instead of passing it by reference in
"delete" functions These functions are deleting an iterator which invalidates
the reference to the shared pointer that was passed in causing a use after
free.
---
indra/newview/llvoicevivox.cpp | 6 +++---
indra/newview/llvoicevivox.h | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index dca9dea668..ae0a4038f2 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -5396,7 +5396,7 @@ LLVivoxVoiceClient::sessionStatePtr_t LLVivoxVoiceClient::addSession(const std::
return result;
}
-void LLVivoxVoiceClient::clearSessionHandle(const sessionStatePtr_t &session)
+void LLVivoxVoiceClient::clearSessionHandle(sessionStatePtr_t session)
{
if (session)
{
@@ -5420,7 +5420,7 @@ void LLVivoxVoiceClient::clearSessionHandle(const sessionStatePtr_t &session)
}
-void LLVivoxVoiceClient::setSessionHandle(const sessionStatePtr_t &session, const std::string &handle)
+void LLVivoxVoiceClient::setSessionHandle(sessionStatePtr_t session, const std::string &handle)
{
// Have to remove the session from the handle-indexed map before changing the handle, or things will break badly.
@@ -5461,7 +5461,7 @@ void LLVivoxVoiceClient::setSessionURI(const sessionStatePtr_t &session, const s
verifySessionState();
}
-void LLVivoxVoiceClient::deleteSession(const sessionStatePtr_t &session)
+void LLVivoxVoiceClient::deleteSession(sessionStatePtr_t session)
{
// Remove the session from the handle map
if(!session->mHandle.empty())
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index b28dd507bb..1c8c3faa13 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -523,10 +523,10 @@ protected:
sessionStatePtr_t findSession(const LLUUID &participant_id);
sessionStatePtr_t addSession(const std::string &uri, const std::string &handle = std::string());
- void clearSessionHandle(const sessionStatePtr_t &session);
- void setSessionHandle(const sessionStatePtr_t &session, const std::string &handle);
+ void clearSessionHandle(sessionStatePtr_t session);
+ void setSessionHandle(sessionStatePtr_t session, const std::string &handle);
void setSessionURI(const sessionStatePtr_t &session, const std::string &uri);
- void deleteSession(const sessionStatePtr_t &session);
+ void deleteSession(sessionStatePtr_t session);
void deleteAllSessions(void);
void verifySessionState(void);
--
GitLab