From fbc95fe7e77ed093f8f7938a4755ce6b175dcaff Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Mon, 14 Jun 2010 17:29:22 +0100 Subject: EXT-7855 FIXED Memory leak in llmessage/llhttpclient.cpp We now free the fileBuffer when we're done in VFileInjector::process_impl() --- indra/llmessage/llhttpclient.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/llmessage') diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp index 9c2e4b5658..e8dc207114 100644 --- a/indra/llmessage/llhttpclient.cpp +++ b/indra/llmessage/llhttpclient.cpp @@ -199,6 +199,7 @@ namespace fileBuffer = new U8 [fileSize]; vfile.read(fileBuffer, fileSize); ostream.write((char*)fileBuffer, fileSize); + delete [] fileBuffer; eos = true; return STATUS_DONE; } -- cgit v1.2.3 From dc446700e3bf41ddb93602013285177996b66bd5 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Mon, 14 Jun 2010 14:30:34 -0700 Subject: FIX EXT-7857 - c-ares library initialization was skipping a new step. --- indra/llmessage/llares.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/llmessage') diff --git a/indra/llmessage/llares.cpp b/indra/llmessage/llares.cpp index 78561b37aa..5b7e5138ef 100644 --- a/indra/llmessage/llares.cpp +++ b/indra/llmessage/llares.cpp @@ -108,7 +108,8 @@ LLAres::LLAres() : mInitSuccess(false), mListener(new LLAresListener(this)) { - if (ares_init(&chan_) != ARES_SUCCESS) + if (ares_library_init( ARES_LIB_INIT_ALL ) != ARES_SUCCESS || + ares_init(&chan_) != ARES_SUCCESS) { llwarns << "Could not succesfully initialize ares!" << llendl; return; @@ -120,6 +121,7 @@ LLAres::LLAres() : LLAres::~LLAres() { ares_destroy(chan_); + ares_library_cleanup(); } void LLAres::cancel() -- cgit v1.2.3