Title: [158624] trunk
- Revision
- 158624
- Author
- eric.carl...@apple.com
- Date
- 2013-11-04 17:33:11 -0800 (Mon, 04 Nov 2013)
Log Message
REGRESSION(r158311): media/media-fragments/TC0054.html and TC0061.html hit assertions
https://bugs.webkit.org/show_bug.cgi?id=123555
Reviewed by Darin Adler.
Source/WebCore:
No new tests, covered by existing tests.
* html/MediaFragmentURIParser.cpp:
(WebCore::MediaFragmentURIParser::parseFragments): Don't add a fragment with empty key or value as
they will not processed.
(WebCore::MediaFragmentURIParser::parseNPTFragment): Remove excess whitespace.
LayoutTests:
* TestExpectations: Remove media/media-fragments/TC0054.html and media/media-fragments/TC0061.html.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (158623 => 158624)
--- trunk/LayoutTests/ChangeLog 2013-11-05 01:31:43 UTC (rev 158623)
+++ trunk/LayoutTests/ChangeLog 2013-11-05 01:33:11 UTC (rev 158624)
@@ -1,3 +1,12 @@
+2013-11-04 Eric Carlson <eric.carl...@apple.com>
+
+ REGRESSION(r158311): media/media-fragments/TC0054.html and TC0061.html hit assertions
+ https://bugs.webkit.org/show_bug.cgi?id=123555
+
+ Reviewed by Darin Adler.
+
+ * TestExpectations: Remove media/media-fragments/TC0054.html and media/media-fragments/TC0061.html.
+
2013-11-04 Chris Fleizach <cfleiz...@apple.com>
AX: Mail attachments at the start of an email are not output by VoiceOver
Modified: trunk/LayoutTests/TestExpectations (158623 => 158624)
--- trunk/LayoutTests/TestExpectations 2013-11-05 01:31:43 UTC (rev 158623)
+++ trunk/LayoutTests/TestExpectations 2013-11-05 01:33:11 UTC (rev 158624)
@@ -71,7 +71,4 @@
# Skipping it for now, then put it again when the spec decides it
fast/mediastream/MediaStream-onended.html [ Skip ]
-webkit.org/b/123555 [ Debug ] media/media-fragments/TC0054.html [ Crash ]
-webkit.org/b/123555 [ Debug ] media/media-fragments/TC0061.html [ Crash ]
-
webkit.org/b/123765 plugins/refcount-leaks.html [ Failure ]
Modified: trunk/Source/WebCore/ChangeLog (158623 => 158624)
--- trunk/Source/WebCore/ChangeLog 2013-11-05 01:31:43 UTC (rev 158623)
+++ trunk/Source/WebCore/ChangeLog 2013-11-05 01:33:11 UTC (rev 158624)
@@ -1,3 +1,17 @@
+2013-11-04 Eric Carlson <eric.carl...@apple.com>
+
+ REGRESSION(r158311): media/media-fragments/TC0054.html and TC0061.html hit assertions
+ https://bugs.webkit.org/show_bug.cgi?id=123555
+
+ Reviewed by Darin Adler.
+
+ No new tests, covered by existing tests.
+
+ * html/MediaFragmentURIParser.cpp:
+ (WebCore::MediaFragmentURIParser::parseFragments): Don't add a fragment with empty key or value as
+ they will not processed.
+ (WebCore::MediaFragmentURIParser::parseNPTFragment): Remove excess whitespace.
+
2013-11-04 Patrick Gansterer <par...@webkit.org>
Remove code duplications in createFontCustomPlatformData()
Modified: trunk/Source/WebCore/html/MediaFragmentURIParser.cpp (158623 => 158624)
--- trunk/Source/WebCore/html/MediaFragmentURIParser.cpp 2013-11-05 01:31:43 UTC (rev 158623)
+++ trunk/Source/WebCore/html/MediaFragmentURIParser.cpp 2013-11-05 01:33:11 UTC (rev 158624)
@@ -139,15 +139,16 @@
// b. Convert name and value to Unicode strings by interpreting them as UTF-8. If either
// name or value are not valid UTF-8 strings, then remove the name-value pair from the list.
- bool validUTF8 = true;
- if (!name.isEmpty()) {
+ bool validUTF8 = false;
+ if (!name.isEmpty() && !value.isEmpty()) {
name = name.utf8(StrictConversion).data();
validUTF8 = !name.isEmpty();
+
+ if (validUTF8) {
+ value = value.utf8(StrictConversion).data();
+ validUTF8 = !value.isEmpty();
+ }
}
- if (validUTF8 && !value.isEmpty()) {
- value = value.utf8(StrictConversion).data();
- validUTF8 = !value.isEmpty();
- }
if (validUTF8)
m_fragments.append(std::make_pair(name, value));
@@ -205,7 +206,7 @@
{
unsigned offset = 0;
if (length >= nptIdentiferLength && timeString[0] == 'n' && timeString[1] == 'p' && timeString[2] == 't' && timeString[3] == ':')
- offset += nptIdentiferLength;
+ offset += nptIdentiferLength;
if (offset == length)
return false;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
