From 8fae347ba9d03faf8cca3d76b23a0985d85cccb3 Mon Sep 17 00:00:00 2001
From: Boroondas Gupte <hg@boroon.dasgupta.ch>
Date: Sun, 1 May 2011 22:04:06 +0200
Subject: [PATCH] VWR-25654 FIXED memory leak in LLTranslate::getTranslateUrl
---
doc/contributions.txt | 2 ++
indra/newview/lltranslate.cpp | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 492a7283feb..0708aa7ec47 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -64,6 +64,7 @@ Aleric Inglewood
VWR-12691
VWR-13996
VWR-14426
+ VWR-25654
SNOW-766
Ales Beaumont
VWR-9352
@@ -160,6 +161,7 @@ Boroondas Gupte
SNOW-610
SNOW-624
VWR-233
+ VWR-25654
WEB-262
Bulli Schumann
CT-218
diff --git a/indra/newview/lltranslate.cpp b/indra/newview/lltranslate.cpp
index 050e34ade9a..93a222d82a0 100644
--- a/indra/newview/lltranslate.cpp
+++ b/indra/newview/lltranslate.cpp
@@ -82,7 +82,9 @@ void LLTranslate::translateMessage(LLHTTPClient::ResponderPtr &result, const std
//static
void LLTranslate::getTranslateUrl(std::string &translate_url, const std::string &from_lang, const std::string &to_lang, const std::string &mesg)
{
- std::string escaped_mesg = curl_escape(mesg.c_str(), mesg.size());
+ char * curl_str = curl_escape(mesg.c_str(), mesg.size());
+ std::string escaped_mesg(curl_str);
+ curl_free(curl_str);
translate_url = m_GoogleURL
+ escaped_mesg + m_GoogleLangSpec
--
GitLab