Title: [176783] tags/Safari-601.1.11/Source/WebKit2
- Revision
- 176783
- Author
- [email protected]
- Date
- 2014-12-03 19:10:33 -0800 (Wed, 03 Dec 2014)
Log Message
Merged r176764. rdar://problem/19132975
Modified Paths
Diff
Modified: tags/Safari-601.1.11/Source/WebKit2/ChangeLog (176782 => 176783)
--- tags/Safari-601.1.11/Source/WebKit2/ChangeLog 2014-12-04 03:08:59 UTC (rev 176782)
+++ tags/Safari-601.1.11/Source/WebKit2/ChangeLog 2014-12-04 03:10:33 UTC (rev 176783)
@@ -1,5 +1,21 @@
2014-12-03 Babak Shafiei <[email protected]>
+ Merge r176764.
+
+ 2014-12-03 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r176489.
+ https://bugs.webkit.org/show_bug.cgi?id=139242
+
+ More iOS breakage (Requested by andersca on #webkit).
+
+ Reverted changeset:
+
+ "Unreviewed, iOS build fix after r176452."
+ http://trac.webkit.org/changeset/176489
+
+2014-12-03 Babak Shafiei <[email protected]>
+
Merge r176762.
2014-12-03 Commit Queue <[email protected]>
Modified: tags/Safari-601.1.11/Source/WebKit2/Shared/ios/QuickLookDocumentData.cpp (176782 => 176783)
--- tags/Safari-601.1.11/Source/WebKit2/Shared/ios/QuickLookDocumentData.cpp 2014-12-04 03:08:59 UTC (rev 176782)
+++ tags/Safari-601.1.11/Source/WebKit2/Shared/ios/QuickLookDocumentData.cpp 2014-12-04 03:10:33 UTC (rev 176783)
@@ -74,7 +74,7 @@
uint8_t* const buffer = static_cast<uint8_t*>(CFAllocatorAllocate(kCFAllocatorDefault, size, 0));
ASSERT(buffer);
- if (!decoder.decodeFixedLengthData(buffer, size)) {
+ if (!decoder.decodeFixedLengthData(buffer, size, 1)) {
CFAllocatorDeallocate(kCFAllocatorDefault, buffer);
return false;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
