mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 23:06:52 +00:00
16aec83f00
- Bug 1175600. Add getRelativePath/setRelativePath to nsIFile. r=froydnj (93515cbda)
- bug 1171124 - Swap some XP_MACOSX for XP_DARWIN in nsLocalFileUnix. r=froydnj (1928918ac)
- Bug 1192230 - clean up reference-counting in xpcom/; r=erahm (11528cd9f)
- missing bit of Bug 1138293 - Use malloc/free/realloc/calloc (365fb9991)
- Bug 1175601. Make nsIFile.getRelativeDescriptor work with paths with aths with arbitrary numbers of segments, not just 32. r=froydnj (a4b5ea11d)
- Bug 1175600 followup. Add getRelativePath to ye othere nsIFile implementatione so as to de-bust ye olde CLOSED TREE (b23dfee9e)
- Bug 1159604 - Use fallible allocations in nsLinebreakConverter.cpp (as the code expects). r=smaug (498f30023)
- Bug 1139547 - Fix unsequenced variable modmification/access error. r=botond,bsmedberg (a8460ecff)
- Bug 1167380 - Mark (Read/Write)SegmentsState::m(Source/Sink) as MOZ_NON_OWNING_REF and mark as MOZ_STACK_CLASS. r=froydnj (a1f2dc2ae)
- Bug 1137464 - add missing include for nsICloneableInputStream.h to nsStreamUtils.cpp; r=bkelly (dddd1831c)
- Bug 1026761 - CID 749761: nsAStreamCopier::Process can use sourceCondition, sinkCondition uninitialized. r=froydnj (a728f2b3e)
- Bug 1189423 - part 1 - Add MOZ_COUNT_CTOR/DTOR for nsXPTCStubBase. r=froydnj (208b578bb)
- Bug 1189423 - part 2 - Remove superfluous |new| result check. r=froydnj (b58d8b1fd)
- Bug 1151506 - Null-check the count parameter in GetConstantCount. r=froydnj (6e89f6635)
- Bug 1171603 - Better size check in nsTSubstring::ReplacePrep. r=ehsan (f17bb9c07)
- Bug 603201 - Enable primitive receivers in [[Get]]. r=jorendorff (24e6b04e2)
- revert/align malloc functions to bug 1156317 21 April 2015 (89de8cbad)
- Bug 1081260 - Update the malloc counters if we successfully recover from OOM; r=jonco (c3a03f041)
- Bug 1196210 - Fix an incomplete assertion in the nursery; r=jonco (84140599a)
- Bug 1198826 - Increment (plain) gcNumber on all GCs, r=terrence (a45b9d65c)
- Bug 1184578 - Fix the nursery profiling print statement; r=sfink (f03accbe4)
- Bug 1188878 - Ensure RematerializedFrames are cleared from Debugger instances on Ion bailout failure. (r=jandem) (0cad2e549)
- pointer style (96793b3b3)
- some leftover (7685205e9)
- pointer style (5dc480bd4)
- Bug 1145781 - Unlazify functions when getting their debug scopes. (r=jimb) (f86c2a1b6)
- Bug 1148388 - Handle lost accesses in missing Debugger scopes for block objects. (r=jimb) (9c1734834)
- Bug 1118865 - Relax assertion in DebugScopeProxy::isMagicMissingArgumentsValue. (r=nbp) (7b46b3929)
- Bug 1193046 - Clear prevUpToDate on younger frames when toggling frame debuggeeness off->on. (r=jimb) (f93459582)
- Bug 1188334 - Fix this one weird case with creating debug block scopes of 0-variable block scopes that come from deprecated let exprs inside generators. (r=jimb) (69cc9afe9)
- code style (dc626020e)
- Bug 1135703 - Ensure that lastProfilingFrame gets set appropriately on ALL JitActivations when profiling is turned on or off. r=shu (64665fe96)
- missing init, taken from TFF (dc9544999)
- pointer style (84478dba2)
- cleanup (6e2dd6ae3)
- reposition due to misspatch (738769d65)
- Bug 1191758 - Rework JS::FormatStackDump() to fix OOM handling r=terrence (680e5f8d2)
- Bug 1195545 - Add instruction reordering pass to IonMonkey, r=sunfish. (ba1441975)
135 lines
3.0 KiB
C++
135 lines
3.0 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 "nsScriptableInputStream.h"
|
|
#include "nsMemory.h"
|
|
#include "nsString.h"
|
|
|
|
NS_IMPL_ISUPPORTS(nsScriptableInputStream, nsIScriptableInputStream)
|
|
|
|
// nsIScriptableInputStream methods
|
|
NS_IMETHODIMP
|
|
nsScriptableInputStream::Close()
|
|
{
|
|
if (!mInputStream) {
|
|
return NS_ERROR_NOT_INITIALIZED;
|
|
}
|
|
return mInputStream->Close();
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsScriptableInputStream::Init(nsIInputStream* aInputStream)
|
|
{
|
|
if (!aInputStream) {
|
|
return NS_ERROR_NULL_POINTER;
|
|
}
|
|
mInputStream = aInputStream;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsScriptableInputStream::Available(uint64_t* aResult)
|
|
{
|
|
if (!mInputStream) {
|
|
return NS_ERROR_NOT_INITIALIZED;
|
|
}
|
|
return mInputStream->Available(aResult);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsScriptableInputStream::Read(uint32_t aCount, char** aResult)
|
|
{
|
|
nsresult rv = NS_OK;
|
|
uint64_t count64 = 0;
|
|
char* buffer = nullptr;
|
|
|
|
if (!mInputStream) {
|
|
return NS_ERROR_NOT_INITIALIZED;
|
|
}
|
|
|
|
rv = mInputStream->Available(&count64);
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
// bug716556 - Ensure count+1 doesn't overflow
|
|
uint32_t count =
|
|
XPCOM_MIN((uint32_t)XPCOM_MIN<uint64_t>(count64, aCount), UINT32_MAX - 1);
|
|
buffer = (char*)moz_malloc(count + 1); // make room for '\0'
|
|
if (!buffer) {
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
rv = ReadHelper(buffer, count);
|
|
if (NS_FAILED(rv)) {
|
|
free(buffer);
|
|
return rv;
|
|
}
|
|
|
|
buffer[count] = '\0';
|
|
*aResult = buffer;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsScriptableInputStream::ReadBytes(uint32_t aCount, nsACString& aResult)
|
|
{
|
|
if (!mInputStream) {
|
|
return NS_ERROR_NOT_INITIALIZED;
|
|
}
|
|
|
|
aResult.SetLength(aCount);
|
|
if (aResult.Length() != aCount) {
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
char* ptr = aResult.BeginWriting();
|
|
nsresult rv = ReadHelper(ptr, aCount);
|
|
if (NS_FAILED(rv)) {
|
|
aResult.Truncate();
|
|
}
|
|
return rv;
|
|
}
|
|
|
|
nsresult
|
|
nsScriptableInputStream::ReadHelper(char* aBuffer, uint32_t aCount)
|
|
{
|
|
uint32_t totalBytesRead = 0;
|
|
while (1) {
|
|
uint32_t bytesRead;
|
|
nsresult rv = mInputStream->Read(aBuffer + totalBytesRead,
|
|
aCount - totalBytesRead,
|
|
&bytesRead);
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
totalBytesRead += bytesRead;
|
|
if (totalBytesRead == aCount) {
|
|
break;
|
|
}
|
|
|
|
// If we have read zero bytes, we have hit EOF.
|
|
if (bytesRead == 0) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsScriptableInputStream::Create(nsISupports* aOuter, REFNSIID aIID,
|
|
void** aResult)
|
|
{
|
|
if (aOuter) {
|
|
return NS_ERROR_NO_AGGREGATION;
|
|
}
|
|
|
|
nsRefPtr<nsScriptableInputStream> sis = new nsScriptableInputStream();
|
|
return sis->QueryInterface(aIID, aResult);
|
|
}
|