Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(125)

Unified Diff: content/browser/accessibility/browser_accessibility_win.cc

Issue 1397183002: Escapes backslash, colon, comma, equals and semicolon in IAccessible2 string attributes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Made formatting fixes. Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/accessibility/browser_accessibility_win.cc
diff --git a/content/browser/accessibility/browser_accessibility_win.cc b/content/browser/accessibility/browser_accessibility_win.cc
index 2704b423ed54c8633197ed4da2c0599453e312a2..daeba4e6443973a2ca143f68ea4435502ff73cb6 100644
--- a/content/browser/accessibility/browser_accessibility_win.cc
+++ b/content/browser/accessibility/browser_accessibility_win.cc
@@ -3631,11 +3631,26 @@ HRESULT BrowserAccessibilityWin::GetStringAttributeAsBstr(
return S_OK;
}
+// Static
+void BrowserAccessibilityWin::SanitizeStringAttributeForIA2(
+ const base::string16& input,
+ base::string16* output) {
+ // According to the IA2 Spec, these characters need to be escaped with a
+ // backslash: backslash, colon, comma, equals and semicolon.
+ // Note that backslash must be replaced first.
+ base::ReplaceChars(input, L"\\", L"\\\\", output);
+ base::ReplaceChars(input, L":", L"\\:", output);
dmazzoni 2015/10/12 17:15:15 This won't work correctly if input and output are
+ base::ReplaceChars(input, L",", L"\\,", output);
+ base::ReplaceChars(input, L"=", L"\\=", output);
+ base::ReplaceChars(input, L";", L"\\;", output);
+}
+
void BrowserAccessibilityWin::StringAttributeToIA2(
ui::AXStringAttribute attribute,
const char* ia2_attr) {
base::string16 value;
if (GetString16Attribute(attribute, &value)) {
+ SanitizeStringAttributeForIA2(value, &value);
win_attributes_->ia2_attributes.push_back(
base::ASCIIToUTF16(ia2_attr) + L":" + value);
}

Powered by Google App Engine
This is Rietveld 408576698