Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 23:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1270310 - Part 3: Make string assignment in HTMLInputElement::GetValueInternal fallible. r=peterv

Browse Source 
This makes the string assignment fallible and also adds checks for the return
value from GetValueInternal and GetValue.
This commit is contained in:
Eric Rahm 2016-05-20 16:15:52 -07:00
parent 99b5f4dce2
commit e69bdc29f2
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dom/html/HTMLInputElement.cpp
View File

@ -1527,7 +1527,10 @@ HTMLInputElement::SetWidth(uint32_t aWidth)
NS_IMETHODIMP
HTMLInputElement::GetValue(nsAString& aValue)
{
GetValueInternal(aValue);
nsresult rv = GetValueInternal(aValue);
if (NS_FAILED(rv)) {
return rv;
}
// Don't return non-sanitized value for types that are experimental on mobile.
if (IsExperimentalMobileType(mType)) {
@ -1544,8 +1547,8 @@ HTMLInputElement::GetValueInternal(nsAString& aValue) const
case VALUE_MODE_VALUE:
if (IsSingleLineTextControl(false)) {
mInputData.mState->GetValue(aValue, true);
} else {
aValue.Assign(mInputData.mValue);
} else if (!aValue.Assign(mInputData.mValue, fallible)) {
return NS_ERROR_OUT_OF_MEMORY;
}
return NS_OK;
@ -1681,6 +1684,15 @@ 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)
{
@ -5763,9 +5775,12 @@ HTMLInputElement::SaveState()
inputState = new HTMLInputElementState();
nsAutoString value;
GetValue(value);
nsresult rv =
nsLinebreakConverter::ConvertStringLineBreaks(
nsresult rv = GetValue(value);
if (NS_FAILED(rv)) {
return rv;
}
rv = nsLinebreakConverter::ConvertStringLineBreaks(
value,
nsLinebreakConverter::eLinebreakPlatform,
nsLinebreakConverter::eLinebreakContent);

2
dom/html/HTMLInputElement.h
View File

@ -623,7 +623,7 @@ public:
SetHTMLAttr(nsGkAtoms::value, aValue, aRv);
}
// XPCOM GetValue() is OK
void GetValue(nsAString& aValue, ErrorResult& aRv);
void SetValue(const nsAString& aValue, ErrorResult& aRv);
Nullable<Date> GetValueAsDate(ErrorResult& aRv);

2
dom/webidl/HTMLInputElement.webidl
View File

@ -86,7 +86,7 @@ interface HTMLInputElement : HTMLElement {
attribute DOMString type;
[Pure, SetterThrows]
attribute DOMString defaultValue;
[Pure, TreatNullAs=EmptyString, SetterThrows]
[Pure, TreatNullAs=EmptyString, Throws]
attribute DOMString value;
[Throws, Pref="dom.experimental_forms"]
attribute Date? valueAsDate;