gecko-dev/xpcom/base/nsCOMPtr.cpp
Andrew McCreight 045d2cf847 Bug 1493226, part 2 - Statically prevent trivial calls to do_QueryInterface that returns an nsresult r=froydnj
This is the same as the other patch, except that it is applied to the
case where the QI returns an nsresult.

In addition, I marked the WithError helper class as being stack-only.

Depends on D7553

Differential Revision: https://phabricator.services.mozilla.com/D7554

--HG--
extra : moz-landing-system : lando
2018-10-04 19:16:30 +00:00

140 lines
3.4 KiB
C++

/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* 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 "nsCOMPtr.h"
nsresult
nsQueryInterfaceISupports::operator()(const nsIID& aIID, void** aAnswer) const
{
nsresult status;
if (mRawPtr) {
status = mRawPtr->QueryInterface(aIID, aAnswer);
} else {
status = NS_ERROR_NULL_POINTER;
}
return status;
}
nsresult
nsQueryInterfaceISupportsWithError::operator()(const nsIID& aIID, void** aAnswer) const
{
nsresult status;
if (mRawPtr) {
status = mRawPtr->QueryInterface(aIID, aAnswer);
} else {
status = NS_ERROR_NULL_POINTER;
}
if (mErrorPtr) {
*mErrorPtr = status;
}
return status;
}
void
nsCOMPtr_base::assign_with_AddRef(nsISupports* aRawPtr)
{
if (aRawPtr) {
NSCAP_ADDREF(this, aRawPtr);
}
assign_assuming_AddRef(aRawPtr);
}
void
nsCOMPtr_base::assign_from_qi(const nsQueryInterfaceISupports aQI, const nsIID& aIID)
{
void* newRawPtr;
if (NS_FAILED(aQI(aIID, &newRawPtr))) {
newRawPtr = nullptr;
}
assign_assuming_AddRef(static_cast<nsISupports*>(newRawPtr));
}
void
nsCOMPtr_base::assign_from_qi_with_error(const nsQueryInterfaceISupportsWithError& aQI,
const nsIID& aIID)
{
void* newRawPtr;
if (NS_FAILED(aQI(aIID, &newRawPtr))) {
newRawPtr = nullptr;
}
assign_assuming_AddRef(static_cast<nsISupports*>(newRawPtr));
}
void
nsCOMPtr_base::assign_from_gs_cid(const nsGetServiceByCID aGS,
const nsIID& aIID)
{
void* newRawPtr;
if (NS_FAILED(aGS(aIID, &newRawPtr))) {
newRawPtr = nullptr;
}
assign_assuming_AddRef(static_cast<nsISupports*>(newRawPtr));
}
void
nsCOMPtr_base::assign_from_gs_cid_with_error(
const nsGetServiceByCIDWithError& aGS, const nsIID& aIID)
{
void* newRawPtr;
if (NS_FAILED(aGS(aIID, &newRawPtr))) {
newRawPtr = nullptr;
}
assign_assuming_AddRef(static_cast<nsISupports*>(newRawPtr));
}
void
nsCOMPtr_base::assign_from_gs_contractid(const nsGetServiceByContractID aGS,
const nsIID& aIID)
{
void* newRawPtr;
if (NS_FAILED(aGS(aIID, &newRawPtr))) {
newRawPtr = nullptr;
}
assign_assuming_AddRef(static_cast<nsISupports*>(newRawPtr));
}
void
nsCOMPtr_base::assign_from_gs_contractid_with_error(
const nsGetServiceByContractIDWithError& aGS, const nsIID& aIID)
{
void* newRawPtr;
if (NS_FAILED(aGS(aIID, &newRawPtr))) {
newRawPtr = nullptr;
}
assign_assuming_AddRef(static_cast<nsISupports*>(newRawPtr));
}
void
nsCOMPtr_base::assign_from_query_referent(
const nsQueryReferent& aQueryReferent, const nsIID& aIID)
{
void* newRawPtr;
if (NS_FAILED(aQueryReferent(aIID, &newRawPtr))) {
newRawPtr = nullptr;
}
assign_assuming_AddRef(static_cast<nsISupports*>(newRawPtr));
}
void
nsCOMPtr_base::assign_from_helper(const nsCOMPtr_helper& aHelper,
const nsIID& aIID)
{
void* newRawPtr;
if (NS_FAILED(aHelper(aIID, &newRawPtr))) {
newRawPtr = nullptr;
}
assign_assuming_AddRef(static_cast<nsISupports*>(newRawPtr));
}
void**
nsCOMPtr_base::begin_assignment()
{
assign_assuming_AddRef(nullptr);
return reinterpret_cast<void**>(&mRawPtr);
}