Title: [211510] branches/safari-603-branch/Source/WebCore
- Revision
- 211510
- Author
- matthew_han...@apple.com
- Date
- 2017-02-01 13:26:11 -0800 (Wed, 01 Feb 2017)
Log Message
Merge r210217. rdar://problem/30260068
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (211509 => 211510)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-01 21:26:09 UTC (rev 211509)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-01 21:26:11 UTC (rev 211510)
@@ -1,3 +1,13 @@
+2017-01-31 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r210217. rdar://problem/30260068
+
+ Committed on behalf of Chris Dumez.
+
+ * bindings/js/JSStorageCustom.cpp:
+ (WebCore::JSStorage::nameGetter):
+ Early-return false if an item has an exception (after propagating it.)
+
2017-01-27 Ryan Haddad <ryanhad...@apple.com>
Merge r211285.
Modified: branches/safari-603-branch/Source/WebCore/bindings/js/JSStorageCustom.cpp (211509 => 211510)
--- branches/safari-603-branch/Source/WebCore/bindings/js/JSStorageCustom.cpp 2017-02-01 21:26:09 UTC (rev 211509)
+++ branches/safari-603-branch/Source/WebCore/bindings/js/JSStorageCustom.cpp 2017-02-01 21:26:11 UTC (rev 211510)
@@ -41,8 +41,12 @@
return false;
auto item = wrapped().getItem(propertyNameToString(propertyName));
- if (item.hasException())
- propagateException(*state, item.releaseException());
+ if (item.hasException()) {
+ auto& vm = state->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+ propagateException(*state, scope, item.releaseException());
+ return false;
+ }
auto string = item.releaseReturnValue();
if (string.isNull())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
