corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1371279 - Try to use reserved stack space instead of heap allocation in nsLocalFile::GetNativeTarget(); r=froydnj

Browse Source
This commit is contained in:
Ehsan Akhgari
2017-06-08 10:04:12 -04:00
parent 3cd9350a44
commit 6d010b2adb
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
xpcom/io/nsLocalFileUnix.cpp
View File

@@ -1753,16 +1753,14 @@ nsLocalFile::GetNativeTarget(nsACString& aResult)
}
int32_t size = (int32_t)symStat.st_size;
char* target = (char*)moz_xmalloc(size + 1);
if (!target) {
nsAutoCString target;
if (!target.SetLength(size, mozilla::fallible)) {
return NS_ERROR_OUT_OF_MEMORY;
}
if (readlink(mPath.get(), target, (size_t)size) < 0) {
free(target);
if (readlink(mPath.get(), target.BeginWriting(), (size_t)size) < 0) {
return NSRESULT_FOR_ERRNO();
}
target[size] = '\0';
nsresult rv = NS_OK;
nsCOMPtr<nsIFile> self(this);
@@ -1778,7 +1776,7 @@ nsLocalFile::GetNativeTarget(nsACString& aResult)
if (NS_FAILED(rv = self->GetParent(getter_AddRefs(parent)))) {
break;
}
if (NS_FAILED(rv = parent->AppendRelativeNativePath(nsDependentCString(target)))) {
if (NS_FAILED(rv = parent->AppendRelativeNativePath(target))) {
break;
}
if (NS_FAILED(rv = parent->GetNativePath(aResult))) {
@@ -1803,26 +1801,21 @@ nsLocalFile::GetNativeTarget(nsACString& aResult)
}
int32_t newSize = (int32_t)symStat.st_size;
if (newSize > size) {
char* newTarget = (char*)moz_xrealloc(target, newSize + 1);
if (!newTarget) {
rv = NS_ERROR_OUT_OF_MEMORY;
break;
}
target = newTarget;
size = newSize;
size = newSize;
nsAutoCString newTarget;
if (!newTarget.SetLength(size, mozilla::fallible)) {
rv = NS_ERROR_OUT_OF_MEMORY;
break;
}
int32_t linkLen = readlink(flatRetval.get(), target, size);
int32_t linkLen = readlink(flatRetval.get(), newTarget.BeginWriting(), size);
if (linkLen == -1) {
rv = NSRESULT_FOR_ERRNO();
break;
}
target[linkLen] = '\0';
target = newTarget;
}
free(target);
if (NS_FAILED(rv)) {
aResult.Truncate();
}