Title: [109747] trunk/Source/WebKit/blackberry
- Revision
- 109747
- Author
- commit-qu...@webkit.org
- Date
- 2012-03-05 07:37:19 -0800 (Mon, 05 Mar 2012)
Log Message
[BlackBerry] DOMSupport visibleSelectionForRangeInputElement incorrectly dereferences a null range.
https://bugs.webkit.org/show_bug.cgi?id=80274
Patch by George Staikos <gstai...@rim.com> on 2012-03-05
Reviewed by Antonio Gomes.
A null range can be returned so we should not blindly deref it.
Reviewed Internally by Mike Fenton.
* WebKitSupport/DOMSupport.cpp:
(BlackBerry::WebKit::DOMSupport::visibleSelectionForRangeInputElement):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (109746 => 109747)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-03-05 15:36:19 UTC (rev 109746)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-03-05 15:37:19 UTC (rev 109747)
@@ -1,3 +1,16 @@
+2012-03-05 George Staikos <gstai...@rim.com>
+
+ [BlackBerry] DOMSupport visibleSelectionForRangeInputElement incorrectly dereferences a null range.
+ https://bugs.webkit.org/show_bug.cgi?id=80274
+
+ Reviewed by Antonio Gomes.
+
+ A null range can be returned so we should not blindly deref it.
+ Reviewed Internally by Mike Fenton.
+
+ * WebKitSupport/DOMSupport.cpp:
+ (BlackBerry::WebKit::DOMSupport::visibleSelectionForRangeInputElement):
+
2012-03-04 Jonathan Dong <jonathan.d...@torchmobile.com.cn>
[BlackBerry] upstream CredentialManager and CredentialTransformData implementation
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp (109746 => 109747)
--- trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp 2012-03-05 15:36:19 UTC (rev 109746)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp 2012-03-05 15:37:19 UTC (rev 109747)
@@ -269,6 +269,10 @@
// Must be content editable, generate the range.
RefPtr<Range> selectionRange = TextIterator::rangeFromLocationAndLength(element, start, end - start);
+
+ if (!selectionRange)
+ return VisibleSelection();
+
if (start == end)
return VisibleSelection(selectionRange.get()->startPosition(), DOWNSTREAM);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
