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

Side by Side Diff: Source/core/editing/MarkupAccumulator.cpp

Issue 1031783002: Escape '&' in javascript URLs for innerHTML/outerHTML (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch for landing Created 5 years, 9 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 unified diff | Download patch
« no previous file with comments | « LayoutTests/fast/innerHTML/javascript-url-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All rights reserved.
3 * Copyright (C) 2009, 2010 Google Inc. All rights reserved. 3 * Copyright (C) 2009, 2010 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 } 211 }
212 212
213 void MarkupAccumulator::appendQuotedURLAttributeValue(StringBuilder& result, con st Element& element, const Attribute& attribute) 213 void MarkupAccumulator::appendQuotedURLAttributeValue(StringBuilder& result, con st Element& element, const Attribute& attribute)
214 { 214 {
215 ASSERT(element.isURLAttribute(attribute)); 215 ASSERT(element.isURLAttribute(attribute));
216 const String resolvedURLString = resolveURLIfNeeded(element, attribute.value ()); 216 const String resolvedURLString = resolveURLIfNeeded(element, attribute.value ());
217 UChar quoteChar = '"'; 217 UChar quoteChar = '"';
218 String strippedURLString = resolvedURLString.stripWhiteSpace(); 218 String strippedURLString = resolvedURLString.stripWhiteSpace();
219 if (protocolIsJavaScript(strippedURLString)) { 219 if (protocolIsJavaScript(strippedURLString)) {
220 // minimal escaping for javascript urls 220 // minimal escaping for javascript urls
221 if (strippedURLString.contains('&'))
222 strippedURLString.replaceWithLiteral('&', "&");
223
221 if (strippedURLString.contains('"')) { 224 if (strippedURLString.contains('"')) {
222 if (strippedURLString.contains('\'')) 225 if (strippedURLString.contains('\''))
223 strippedURLString.replaceWithLiteral('"', """); 226 strippedURLString.replaceWithLiteral('"', """);
224 else 227 else
225 quoteChar = '\''; 228 quoteChar = '\'';
226 } 229 }
227 result.append(quoteChar); 230 result.append(quoteChar);
228 result.append(strippedURLString); 231 result.append(strippedURLString);
229 result.append(quoteChar); 232 result.append(quoteChar);
230 return; 233 return;
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 588
586 String str = node.nodeValue(); 589 String str = node.nodeValue();
587 if (startPosition().containerNode() == node) 590 if (startPosition().containerNode() == node)
588 str.truncate(endPosition().offsetInContainerNode()); 591 str.truncate(endPosition().offsetInContainerNode());
589 if (endPosition().containerNode() == node) 592 if (endPosition().containerNode() == node)
590 str.remove(0, startPosition().offsetInContainerNode()); 593 str.remove(0, startPosition().offsetInContainerNode());
591 return str; 594 return str;
592 } 595 }
593 596
594 } 597 }
OLDNEW
« no previous file with comments | « LayoutTests/fast/innerHTML/javascript-url-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698