forked from mirrors/gecko-dev
1a1f42da37
This changeset is the result of adding modernize-use-default-member-init to tools/clang-tidy/config.yaml then proceeding to run `./mach static-analysis check netwerk/ --fix` I then went through the resulting fix and manually updated all of the member variables which were missed due to them having a non-trivial constructor. Note that the tool was only run on Linux, so code that only runs on some platforms may have been missed. The member variables that are still initialized in the contructor definition are: - bitfields (not all currently supported compilers allow default-member-init - variables that are initialized via a parameter - variables that use code not visible in the header file There are a few advantages to landing this change: - fewer lines of code - now declaration is in the same place as initialization this also makes it easier to see when looking at the header. - it makes it harder to miss initializing a member when adding a new contructor - variables that depend on an include guard look much nicer now Additionally I removed some unnecessary reinitialization of NetAddr members (it has a constructor that does that now), and changed nsWifiScannerDBus to use the thread-safe strtok_r instead of strtok. Differential Revision: https://phabricator.services.mozilla.com/D116980
127 lines
3.5 KiB
C++
127 lines
3.5 KiB
C++
/* -*- Mode: C++; tab-width: 4; 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 <algorithm>
|
|
#include "ArrayBufferInputStream.h"
|
|
#include "nsStreamUtils.h"
|
|
#include "js/ArrayBuffer.h" // JS::{GetArrayBuffer{ByteLength,Data},IsArrayBufferObject}
|
|
#include "js/RootingAPI.h" // JS::{Handle,Rooted}
|
|
#include "js/Value.h" // JS::Value
|
|
#include "mozilla/UniquePtrExtensions.h"
|
|
#include "mozilla/dom/ScriptSettings.h"
|
|
|
|
using mozilla::dom::RootingCx;
|
|
|
|
NS_IMPL_ISUPPORTS(ArrayBufferInputStream, nsIArrayBufferInputStream,
|
|
nsIInputStream);
|
|
|
|
NS_IMETHODIMP
|
|
ArrayBufferInputStream::SetData(JS::Handle<JS::Value> aBuffer,
|
|
uint64_t aByteOffset, uint64_t aLength) {
|
|
NS_ASSERT_OWNINGTHREAD(ArrayBufferInputStream);
|
|
|
|
if (!aBuffer.isObject()) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
JS::Rooted<JSObject*> arrayBuffer(RootingCx(), &aBuffer.toObject());
|
|
if (!JS::IsArrayBufferObject(arrayBuffer)) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
uint64_t buflen = JS::GetArrayBufferByteLength(arrayBuffer);
|
|
uint64_t offset = std::min(buflen, aByteOffset);
|
|
uint64_t bufferLength = std::min(buflen - offset, aLength);
|
|
|
|
// Prevent truncation.
|
|
if (bufferLength > UINT32_MAX) {
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
|
|
mArrayBuffer = mozilla::MakeUniqueFallible<char[]>(bufferLength);
|
|
if (!mArrayBuffer) {
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
mBufferLength = bufferLength;
|
|
|
|
JS::AutoCheckCannotGC nogc;
|
|
bool isShared;
|
|
char* src =
|
|
(char*)JS::GetArrayBufferData(arrayBuffer, &isShared, nogc) + offset;
|
|
memcpy(&mArrayBuffer[0], src, mBufferLength);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ArrayBufferInputStream::Close() {
|
|
mClosed = true;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ArrayBufferInputStream::Available(uint64_t* aCount) {
|
|
if (mClosed) {
|
|
return NS_BASE_STREAM_CLOSED;
|
|
}
|
|
if (mArrayBuffer) {
|
|
*aCount = mBufferLength ? mBufferLength - mPos : 0;
|
|
} else {
|
|
*aCount = 0;
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ArrayBufferInputStream::Read(char* aBuf, uint32_t aCount,
|
|
uint32_t* aReadCount) {
|
|
return ReadSegments(NS_CopySegmentToBuffer, aBuf, aCount, aReadCount);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ArrayBufferInputStream::ReadSegments(nsWriteSegmentFun writer, void* closure,
|
|
uint32_t aCount, uint32_t* result) {
|
|
NS_ASSERTION(result, "null ptr");
|
|
NS_ASSERTION(mBufferLength >= mPos, "bad stream state");
|
|
|
|
if (mClosed) {
|
|
return NS_BASE_STREAM_CLOSED;
|
|
}
|
|
|
|
MOZ_ASSERT(mArrayBuffer || (mPos == mBufferLength),
|
|
"stream inited incorrectly");
|
|
|
|
*result = 0;
|
|
while (mPos < mBufferLength) {
|
|
uint32_t remaining = mBufferLength - mPos;
|
|
MOZ_ASSERT(mArrayBuffer);
|
|
|
|
uint32_t count = std::min(aCount, remaining);
|
|
if (count == 0) {
|
|
break;
|
|
}
|
|
|
|
uint32_t written;
|
|
nsresult rv = writer(this, closure, &mArrayBuffer[0] + mPos, *result, count,
|
|
&written);
|
|
if (NS_FAILED(rv)) {
|
|
// InputStreams do not propagate errors to caller.
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_ASSERTION(written <= count,
|
|
"writer should not write more than we asked it to write");
|
|
mPos += written;
|
|
*result += written;
|
|
aCount -= written;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ArrayBufferInputStream::IsNonBlocking(bool* aNonBlocking) {
|
|
*aNonBlocking = true;
|
|
return NS_OK;
|
|
}
|