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

Bug 1317367 part 2. Make HTMLInputElement::GetValue infallible again; just return empty string on OOM. To a first approximation no one checks the return value anyway. r=smaug

Browse Source
This commit is contained in:
Boris Zbarsky
2016-11-15 12:46:31 -05:00
parent 2966e5d9fc
commit 9535becb37
3 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
dom/html/HTMLInputElement.cpp
View File

@@ -1755,10 +1755,7 @@ HTMLInputElement::SetWidth(uint32_t aWidth)
NS_IMETHODIMP
HTMLInputElement::GetValue(nsAString& aValue)
{
nsresult rv = GetValueInternal(aValue);
if (NS_FAILED(rv)) {
return rv;
}
GetValueInternal(aValue);
// Don't return non-sanitized value for types that are experimental on mobile
// or datetime types
@@ -1769,7 +1766,7 @@ HTMLInputElement::GetValue(nsAString& aValue)
return NS_OK;
}
nsresult
void
HTMLInputElement::GetValueInternal(nsAString& aValue) const
{
switch (GetValueMode()) {
@@ -1777,9 +1774,9 @@ HTMLInputElement::GetValueInternal(nsAString& aValue) const
if (IsSingleLineTextControl(false)) {
mInputData.mState->GetValue(aValue, true);
} else if (!aValue.Assign(mInputData.mValue, fallible)) {
return NS_ERROR_OUT_OF_MEMORY;
aValue.Truncate();
}
return NS_OK;
return;
case VALUE_MODE_FILENAME:
if (nsContentUtils::LegacyIsCallerChromeOrNativeCode()) {
@@ -1793,23 +1790,20 @@ HTMLInputElement::GetValueInternal(nsAString& aValue) const
}
}
return NS_OK;
return;
case VALUE_MODE_DEFAULT:
// Treat defaultValue as value.
GetAttr(kNameSpaceID_None, nsGkAtoms::value, aValue);
return NS_OK;
return;
case VALUE_MODE_DEFAULT_ON:
// Treat default value as value and returns "on" if no value.
if (!GetAttr(kNameSpaceID_None, nsGkAtoms::value, aValue)) {
aValue.AssignLiteral("on");
}
return NS_OK;
return;
}
// This return statement is required for some compilers.
return NS_OK;
}
bool
@@ -1943,15 +1937,6 @@ HTMLInputElement::GetValueAsDecimal() const
: decimalValue;
}
void
HTMLInputElement::GetValue(nsAString& aValue, ErrorResult& aRv)
{
nsresult rv = GetValue(aValue);
if (NS_FAILED(rv)) {
aRv.Throw(rv);
}
}
void
HTMLInputElement::SetValue(const nsAString& aValue, ErrorResult& aRv)
{
@@ -7543,7 +7528,7 @@ HTMLInputElement::HasTypeMismatch() const
}
nsAutoString value;
NS_ENSURE_SUCCESS(GetValueInternal(value), false);
GetValueInternal(value);
if (value.IsEmpty()) {
return false;
@@ -7586,7 +7571,7 @@ HTMLInputElement::HasPatternMismatch() const
GetAttr(kNameSpaceID_None, nsGkAtoms::pattern, pattern);
nsAutoString value;
NS_ENSURE_SUCCESS(GetValueInternal(value), false);
GetValueInternal(value);
if (value.IsEmpty()) {
return false;
@@ -7745,7 +7730,7 @@ HTMLInputElement::HasBadInput() const
nsAutoString value;
nsAutoCString unused;
uint32_t unused2;
NS_ENSURE_SUCCESS(GetValueInternal(value), false);
GetValueInternal(value);
HTMLSplitOnSpacesTokenizer tokenizer(value, ',');
while (tokenizer.hasMoreTokens()) {
if (!PunycodeEncodeEmailAddress(tokenizer.nextToken(), unused, &unused2)) {