From 238bee30e8fe312cf8fe06cfa8b94e4d18a7da13 Mon Sep 17 00:00:00 2001 From: "bbaetz%student.usyd.edu.au" Date: Fri, 12 Jul 2002 04:54:09 +0000 Subject: [PATCH] Bug 155032 - Memory leak of 18 bytes from 1 block allocated in nsSOCKSSocketInfo::GetProxyHost r=smeredith, sr=alecf, a=roc+moz git-svn-id: svn://10.0.0.236/trunk@125077 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/netwerk/socket/base/nsSOCKSIOLayer.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mozilla/netwerk/socket/base/nsSOCKSIOLayer.cpp b/mozilla/netwerk/socket/base/nsSOCKSIOLayer.cpp index ff1072d8252..fbdecf3283c 100644 --- a/mozilla/netwerk/socket/base/nsSOCKSIOLayer.cpp +++ b/mozilla/netwerk/socket/base/nsSOCKSIOLayer.cpp @@ -563,11 +563,11 @@ nsSOCKSIOLayerConnect(PRFileDesc *fd, const PRNetAddr *addr, PRIntervalTime /*ti // First, we need to look up our proxy... char scratch[PR_NETDB_BUF_SIZE]; PRHostEnt hostentry; - char * proxyHost; + nsXPIDLCString proxyHost; - nsresult rv = info->GetProxyHost(&proxyHost); + nsresult rv = info->GetProxyHost(getter_Copies(proxyHost)); - if (NS_FAILED(rv) || !proxyHost || !(*proxyHost)) { + if (NS_FAILED(rv) || proxyHost.IsEmpty()) { return PR_FAILURE; } @@ -578,12 +578,12 @@ nsSOCKSIOLayerConnect(PRFileDesc *fd, const PRNetAddr *addr, PRIntervalTime /*ti return PR_FAILURE; } - LOGDEBUG(("nsSOCKSIOLayerConnect SOCKS %u; proxyHost: %s.", socksVersion, proxyHost)); + LOGDEBUG(("nsSOCKSIOLayerConnect SOCKS %u; proxyHost: %s.", socksVersion, proxyHost.get())); status = PR_GetHostByName(proxyHost, scratch, PR_NETDB_BUF_SIZE, &hostentry); if (PR_SUCCESS != status) { - LOGERROR(("PR_GetHostByName() failed. proxyHost = %s, status = %x.",proxyHost, status)); + LOGERROR(("PR_GetHostByName() failed. proxyHost = %s, status = %x.",proxyHost.get(), status)); return status; } @@ -646,7 +646,7 @@ nsSOCKSIOLayerConnect(PRFileDesc *fd, const PRNetAddr *addr, PRIntervalTime /*ti status = fd->lower->methods->connect(fd->lower, &proxyAddr, connectWait); if (PR_SUCCESS != status) { - LOGERROR(("Failed to TCP connect to the proxy server (%s): timeout = %d, status = %x.",proxyHost, connectWait, status)); + LOGERROR(("Failed to TCP connect to the proxy server (%s): timeout = %d, status = %x.",proxyHost.get(), connectWait, status)); PR_SetSocketOption(fd, &sockopt); return status; }