mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fixed a memory leak (was leaking the strdup("?"), landed stream converter stuff on Mac.

This commit is contained in:
beard%netscape.com 1999-09-01 21:50:32 +00:00
Родитель e6985e475d
Коммит 4dbb793c3e
2 изменённых файлов: 4 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
uriloader/base/nsDocLoader.cpp
Просмотреть файл

@ -57,11 +57,9 @@
#include "prlog.h" #include "prlog.h"
#include "prprf.h" #include "prprf.h"
#ifndef XP_MAC
#include "nsIStreamConverterService.h" #include "nsIStreamConverterService.h"
#include "nsIStreamConverter.h" #include "nsIStreamConverter.h"
static NS_DEFINE_CID(kStreamConverterServiceCID, NS_STREAMCONVERTERSERVICE_CID); static NS_DEFINE_CID(kStreamConverterServiceCID, NS_STREAMCONVERTERSERVICE_CID);
#endif // XP_MAC
#include <iostream.h> #include <iostream.h>
@ -1199,10 +1197,10 @@ void nsDocLoaderImpl::FireOnEndDocumentLoad(nsDocLoaderImpl* aLoadInitiator,
if (aLoadInitiator->mDocumentChannel) if (aLoadInitiator->mDocumentChannel)
rv = aLoadInitiator->mDocumentChannel->GetURI(getter_AddRefs(uri)); rv = aLoadInitiator->mDocumentChannel->GetURI(getter_AddRefs(uri));
if (NS_SUCCEEDED(rv)) { if (NS_SUCCEEDED(rv)) {
char* buffer = nsCRT::strdup("?"); char* buffer = nsnull;
if (uri) if (uri)
rv = uri->GetSpec(&buffer); rv = uri->GetSpec(&buffer);
if (NS_SUCCEEDED(rv)) { if (NS_SUCCEEDED(rv) && buffer != nsnull) {
PR_LOG(gDocLoaderLog, PR_LOG_DEBUG, PR_LOG(gDocLoaderLog, PR_LOG_DEBUG,
("DocLoader:%p: Firing OnEndDocumentLoad(...) called for [DocLoader:%p] %s\n", ("DocLoader:%p: Firing OnEndDocumentLoad(...) called for [DocLoader:%p] %s\n",
this, aLoadInitiator, buffer)); this, aLoadInitiator, buffer));
@ -2392,7 +2390,6 @@ nsChannelListener::OnStartRequest(nsIChannel *aChannel, nsISupports *aContext)
/////////////////////////////// ///////////////////////////////
// STREAM CONVERTERS // STREAM CONVERTERS
/////////////////////////////// ///////////////////////////////
#ifndef XP_MAC
char *contentType = nsnull; char *contentType = nsnull;
rv = aChannel->GetContentType(&contentType); rv = aChannel->GetContentType(&contentType);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
@ -2420,7 +2417,6 @@ nsChannelListener::OnStartRequest(nsIChannel *aChannel, nsISupports *aContext)
mNextListener = converterListener; mNextListener = converterListener;
} }
nsAllocator::Free(contentType); nsAllocator::Free(contentType);
#endif // XP_MAC
////////////////////////////// //////////////////////////////
// END STREAM CONVERTERS // END STREAM CONVERTERS

8
webshell/src/nsDocLoader.cpp
Просмотреть файл

@ -57,11 +57,9 @@
#include "prlog.h" #include "prlog.h"
#include "prprf.h" #include "prprf.h"
#ifndef XP_MAC
#include "nsIStreamConverterService.h" #include "nsIStreamConverterService.h"
#include "nsIStreamConverter.h" #include "nsIStreamConverter.h"
static NS_DEFINE_CID(kStreamConverterServiceCID, NS_STREAMCONVERTERSERVICE_CID); static NS_DEFINE_CID(kStreamConverterServiceCID, NS_STREAMCONVERTERSERVICE_CID);
#endif // XP_MAC
#include <iostream.h> #include <iostream.h>
@ -1199,10 +1197,10 @@ void nsDocLoaderImpl::FireOnEndDocumentLoad(nsDocLoaderImpl* aLoadInitiator,
if (aLoadInitiator->mDocumentChannel) if (aLoadInitiator->mDocumentChannel)
rv = aLoadInitiator->mDocumentChannel->GetURI(getter_AddRefs(uri)); rv = aLoadInitiator->mDocumentChannel->GetURI(getter_AddRefs(uri));
if (NS_SUCCEEDED(rv)) { if (NS_SUCCEEDED(rv)) {
char* buffer = nsCRT::strdup("?"); char* buffer = nsnull;
if (uri) if (uri)
rv = uri->GetSpec(&buffer); rv = uri->GetSpec(&buffer);
if (NS_SUCCEEDED(rv)) { if (NS_SUCCEEDED(rv) && buffer != nsnull) {
PR_LOG(gDocLoaderLog, PR_LOG_DEBUG, PR_LOG(gDocLoaderLog, PR_LOG_DEBUG,
("DocLoader:%p: Firing OnEndDocumentLoad(...) called for [DocLoader:%p] %s\n", ("DocLoader:%p: Firing OnEndDocumentLoad(...) called for [DocLoader:%p] %s\n",
this, aLoadInitiator, buffer)); this, aLoadInitiator, buffer));
@ -2392,7 +2390,6 @@ nsChannelListener::OnStartRequest(nsIChannel *aChannel, nsISupports *aContext)
/////////////////////////////// ///////////////////////////////
// STREAM CONVERTERS // STREAM CONVERTERS
/////////////////////////////// ///////////////////////////////
#ifndef XP_MAC
char *contentType = nsnull; char *contentType = nsnull;
rv = aChannel->GetContentType(&contentType); rv = aChannel->GetContentType(&contentType);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
@ -2420,7 +2417,6 @@ nsChannelListener::OnStartRequest(nsIChannel *aChannel, nsISupports *aContext)
mNextListener = converterListener; mNextListener = converterListener;
} }
nsAllocator::Free(contentType); nsAllocator::Free(contentType);
#endif // XP_MAC
////////////////////////////// //////////////////////////////
// END STREAM CONVERTERS // END STREAM CONVERTERS