From 788c787ea7bb80d1a9b29f210d9af9f4da5d4cdb Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Fri, 11 Jun 2010 18:56:18 -0700 Subject: Upgraded windows libcurl to 7.20.1 and c-ares to 1.7.1 for consistency with mac/linux and potentially improve EXT-7032 behavior. --- indra/llmessage/llares.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llmessage') diff --git a/indra/llmessage/llares.cpp b/indra/llmessage/llares.cpp index 00e77d20e9..78561b37aa 100644 --- a/indra/llmessage/llares.cpp +++ b/indra/llmessage/llares.cpp @@ -473,7 +473,7 @@ bool LLAres::process(U64 timeout) ll_init_apr(); } - int socks[ARES_GETSOCK_MAXNUM]; + ares_socket_t socks[ARES_GETSOCK_MAXNUM]; apr_pollfd_t aprFds[ARES_GETSOCK_MAXNUM]; apr_int32_t nsds = 0; int nactive = 0; -- cgit v1.2.3 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