mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 12:25:53 +00:00
3e439bb4f8
It's silly to use prmem.h within Firefox code given that in our configuration its functions are just wrappers for malloc() et al. (Indeed, in some places we mix PR_Malloc() with free(), or malloc() with PR_Free().) This patch removes all uses, except for the places where we need to use PR_Free() to free something allocated by another NSPR function; in those cases I've added a comment explaining which function did the allocation. --HG-- extra : rebase_source : 0f781bca68b5bf3c4c191e09e277dfc8becffa09
81 lines
2.2 KiB
C++
81 lines
2.2 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "mozilla/Assertions.h"
|
|
#include "ShutdownLayer.h"
|
|
#include "prerror.h"
|
|
#include "private/pprio.h"
|
|
#include "prmem.h"
|
|
#include <winsock2.h>
|
|
|
|
static PRDescIdentity sWinSockShutdownLayerIdentity;
|
|
static PRIOMethods sWinSockShutdownLayerMethods;
|
|
static PRIOMethods *sWinSockShutdownLayerMethodsPtr = nullptr;
|
|
|
|
namespace mozilla {
|
|
namespace net {
|
|
|
|
extern PRDescIdentity nsNamedPipeLayerIdentity;
|
|
|
|
} // namespace net
|
|
} // namespace mozilla
|
|
|
|
|
|
PRStatus
|
|
WinSockClose(PRFileDesc *aFd)
|
|
{
|
|
MOZ_RELEASE_ASSERT(aFd->identity == sWinSockShutdownLayerIdentity,
|
|
"Windows shutdown layer not on the top of the stack");
|
|
|
|
PROsfd osfd = PR_FileDesc2NativeHandle(aFd);
|
|
if (osfd != -1) {
|
|
shutdown(osfd, SD_BOTH);
|
|
}
|
|
|
|
aFd->identity = PR_INVALID_IO_LAYER;
|
|
|
|
if (aFd->lower) {
|
|
return aFd->lower->methods->close(aFd->lower);
|
|
} else {
|
|
return PR_SUCCESS;
|
|
}
|
|
}
|
|
|
|
nsresult mozilla::net::AttachShutdownLayer(PRFileDesc *aFd)
|
|
{
|
|
if (!sWinSockShutdownLayerMethodsPtr) {
|
|
sWinSockShutdownLayerIdentity =
|
|
PR_GetUniqueIdentity("windows shutdown call layer");
|
|
sWinSockShutdownLayerMethods = *PR_GetDefaultIOMethods();
|
|
sWinSockShutdownLayerMethods.close = WinSockClose;
|
|
sWinSockShutdownLayerMethodsPtr = &sWinSockShutdownLayerMethods;
|
|
}
|
|
|
|
if (mozilla::net::nsNamedPipeLayerIdentity &&
|
|
PR_GetIdentitiesLayer(aFd, mozilla::net::nsNamedPipeLayerIdentity)) {
|
|
// Do not attach shutdown layer on named pipe layer,
|
|
// it is for PR_NSPR_IO_LAYER only.
|
|
return NS_OK;
|
|
}
|
|
|
|
PRFileDesc * layer;
|
|
PRStatus status;
|
|
|
|
layer = PR_CreateIOLayerStub(sWinSockShutdownLayerIdentity,
|
|
sWinSockShutdownLayerMethodsPtr);
|
|
if (!layer) {
|
|
return NS_OK;
|
|
}
|
|
|
|
status = PR_PushIOLayer(aFd, PR_NSPR_IO_LAYER, layer);
|
|
|
|
if (status == PR_FAILURE) {
|
|
PR_Free(layer); // PR_CreateIOLayerStub() uses PR_Malloc().
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
return NS_OK;
|
|
}
|