188938 2018-08-24 17:23:49 -0700 Make IDBCursor::m_request a WeakPtr 2018-08-26 19:45:18 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=188728 InRadar P2 Normal --- 1 youennf youennf achristensen alecflett beidson commit-queue ews-watchlist jsbell webkit-bug-importer oldest_to_newest 1453629 0 youennf 2018-08-24 17:23:49 -0700 This will ensure we will not try to use a request pointer that is no longer valid 1453630 1 348060 youennf 2018-08-24 17:26:50 -0700 Created attachment 348060 Patch 1453660 2 348060 achristensen 2018-08-24 21:17:06 -0700 Comment on attachment 348060 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=348060&action=review > Source/WebCore/Modules/indexeddb/IDBCursor.cpp:178 > + if (!m_request) > + return Exception { InvalidStateError }; Can this be reached? If so it should have a test. If not, shouldn't it be an assert? 1453678 3 youennf 2018-08-25 10:55:47 -0700 > > Source/WebCore/Modules/indexeddb/IDBCursor.cpp:178 > > + if (!m_request) > > + return Exception { InvalidStateError }; > > Can this be reached? If so it should have a test. If not, shouldn't it be > an assert? This check is happening for advance and continue so if it is reachable for them, it makes sense to be reachable for continuePrimaryKey. From my reading of the code, JSIDBCursor is protecting its JSIDBRequest. The case where this error case might happen might be something like: - IDBCursor is created with a request - The request is never exposed to scripts so its JSIDBRequest does not exist. - The request gets destroyed - The cursor is asked to advance. I can have a further look as a follow-up, I believe all 3 functions should be treated the same there, ie assert or exit early. 1453680 4 348060 commit-queue 2018-08-25 11:22:20 -0700 Comment on attachment 348060 Patch Rejecting attachment 348060 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 348060, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=348060&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=188938&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Updating working directory Processing patch 348060 from bug 188938. Fetching: https://bugs.webkit.org/attachment.cgi?id=348060 Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Committing to http://svn.webkit.org/repository/webkit/trunk ... M Source/WebCore/ChangeLog M Source/WebCore/Modules/indexeddb/IDBCursor.cpp M Source/WebCore/Modules/indexeddb/IDBCursor.h M Source/WebCore/Modules/indexeddb/IDBRequest.h ERROR from SVN: A repository hook failed: Commit blocked by pre-commit hook (exit code 1) with output: Commits are currently disabled while we update infrastructure. W: 7c4294d639c399bd273b69e1ccaa229dd9e07e24 and refs/remotes/origin/master differ, using rebase: :040000 040000 ce40709dcfbc7fb25b1e5ed0ad3de8ebb0ec8a52 162abbfb909fd78b90c6722de4a4368f8d472b8a M Source Current branch master is up to date. ERROR: Not all changes have been committed into SVN, however the committed ones (if any) seem to be successfully integrated into the working tree. Please see the above messages for details. Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Committing to http://svn.webkit.org/repository/webkit/trunk ... M Source/WebCore/ChangeLog M Source/WebCore/Modules/indexeddb/IDBCursor.cpp M Source/WebCore/Modules/indexeddb/IDBCursor.h M Source/WebCore/Modules/indexeddb/IDBRequest.h ERROR from SVN: A repository hook failed: Commit blocked by pre-commit hook (exit code 1) with output: Commits are currently disabled while we update infrastructure. W: 7c4294d639c399bd273b69e1ccaa229dd9e07e24 and refs/remotes/origin/master differ, using rebase: :040000 040000 ce40709dcfbc7fb25b1e5ed0ad3de8ebb0ec8a52 162abbfb909fd78b90c6722de4a4368f8d472b8a M Source Current branch master is up to date. ERROR: Not all changes have been committed into SVN, however the committed ones (if any) seem to be successfully integrated into the working tree. Please see the above messages for details. Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Updating OpenSource Current branch master is up to date. Full output: https://webkit-queues.webkit.org/results/8982502 1453765 5 348060 commit-queue 2018-08-26 19:44:24 -0700 Comment on attachment 348060 Patch Clearing flags on attachment: 348060 Committed r235345: <https://trac.webkit.org/changeset/235345> 1453766 6 commit-queue 2018-08-26 19:44:26 -0700 All reviewed patches have been landed. Closing bug. 1453767 7 webkit-bug-importer 2018-08-26 19:45:18 -0700 <rdar://problem/43740265> 348060 2018-08-24 17:26:50 -0700 2018-08-26 19:44:24 -0700 Patch bug-188938-20180824172649.patch text/plain 4827 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1MzIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGRiMjdmOGQzYjYzNTZj MGQyODI5ODg5NTI5OTZiMDFkYmI2ZmQ0OC4uM2VjMTU2NTNmN2Y4ZjE0YTgwNTBiZjQ2YmU4Mzg1 YjUzY2Q0ODM1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTA4LTI0ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIElEQkN1cnNvcjo6 bV9yZXF1ZXN0IGEgV2Vha1B0cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTg4OTM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgTWFrZSBtX3JlcXVlc3QgYSBXZWFrUHRyIHNvIHRoYXQgaWYgbV9yZXF1ZXN0 IGlzIGRlc3Ryb3llZCwgdGhlIHJlbGF0ZWQgY3Vyc29yIHdpbGwgbm90IHVzZSB0aGUgaW52YWxp ZCBwb2ludGVyLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAg ICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJDdXJzb3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SURCQ3Vyc29yOjpjb250aW51ZVByaW1hcnlLZXkpOiBPdGhlciBjb250aW51ZSBhbmQgYWR2YW5j ZSBtZXRob2RzIHRoYXQgYXJlIGNhbGxpbmcgdW5jaGVja2VkSXRlcmF0ZUN1cnNvciBkbyBjaGVj ayBmb3IgbV9yZXF1ZXN0LgorICAgICAgICBBcHBseSB0aGUgc2FtZSBjaGVjayBmb3IgY29udGlu dWVQcmltYXJ5S2V5LgorICAgICAgICAoV2ViQ29yZTo6SURCQ3Vyc29yOjp1bmNoZWNrZWRJdGVy YXRlQ3Vyc29yKToKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJDdXJzb3IuaDoKKyAg ICAgICAgKFdlYkNvcmU6OklEQkN1cnNvcjo6c2V0UmVxdWVzdCk6CisgICAgICAgIChXZWJDb3Jl OjpJREJDdXJzb3I6OmNsZWFyUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpJREJDdXJzb3I6 OnJlcXVlc3QpOgorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL0lEQlJlcXVlc3QuaDoKKwog MjAxOC0wOC0yNCAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAKICAgICAgICAgW0Fw cGxlIFBheV0gQWxsb3cgJDAgdG90YWxzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9JREJDdXJzb3IuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRl eGVkZGIvSURCQ3Vyc29yLmNwcAppbmRleCAwNWRiODM0MTdlNWMwMWM5NTY3YTUyYzAyYjI5ZGMy NzYwYTM3MGMwLi5kODQ1OTBhMDc4ZWI1YmYyNWVhOWRmZmMwZGZhYjRlYjRkMDJiOTIwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJDdXJzb3IuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkN1cnNvci5jcHAKQEAgLTE3 NCw2ICsxNzQsOSBAQCBFeGNlcHRpb25Pcjx2b2lkPiBJREJDdXJzb3I6OmFkdmFuY2UodW5zaWdu ZWQgY291bnQpCiAKIEV4Y2VwdGlvbk9yPHZvaWQ+IElEQkN1cnNvcjo6Y29udGludWVQcmltYXJ5 S2V5KEV4ZWNTdGF0ZSYgc3RhdGUsIEpTVmFsdWUga2V5VmFsdWUsIEpTVmFsdWUgcHJpbWFyeUtl eVZhbHVlKQogeworICAgIGlmICghbV9yZXF1ZXN0KQorICAgICAgICByZXR1cm4gRXhjZXB0aW9u IHsgSW52YWxpZFN0YXRlRXJyb3IgfTsKKwogICAgIGlmICghdHJhbnNhY3Rpb24oKS5pc0FjdGl2 ZSgpKQogICAgICAgICByZXR1cm4gRXhjZXB0aW9uIHsgVHJhbnNhY3Rpb25JbmFjdGl2ZUVycm9y LCAiRmFpbGVkIHRvIGV4ZWN1dGUgJ2NvbnRpbnVlUHJpbWFyeUtleScgb24gJ0lEQkN1cnNvcic6 IFRoZSB0cmFuc2FjdGlvbiBpcyBpbmFjdGl2ZSBvciBmaW5pc2hlZC4iX3MgfTsKIApAQCAtMjY3 LDYgKzI3MCw3IEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IElEQkN1cnNvcjo6Y29udGludWVGdW5jdGlv bihjb25zdCBJREJLZXlEYXRhJiBrZXkpCiAKIHZvaWQgSURCQ3Vyc29yOjp1bmNoZWNrZWRJdGVy YXRlQ3Vyc29yKGNvbnN0IElEQktleURhdGEmIGtleSwgdW5zaWduZWQgY291bnQpCiB7CisgICAg QVNTRVJUKG1fcmVxdWVzdCk7CiAgICAgQVNTRVJUKCZlZmZlY3RpdmVPYmplY3RTdG9yZSgpLnRy YW5zYWN0aW9uKCkuZGF0YWJhc2UoKS5vcmlnaW5UaHJlYWQoKSA9PSAmVGhyZWFkOjpjdXJyZW50 KCkpOwogCiAgICAgKyttX291dHN0YW5kaW5nUmVxdWVzdENvdW50OwpAQCAtMjc3LDYgKzI4MSw3 IEBAIHZvaWQgSURCQ3Vyc29yOjp1bmNoZWNrZWRJdGVyYXRlQ3Vyc29yKGNvbnN0IElEQktleURh dGEmIGtleSwgdW5zaWduZWQgY291bnQpCiAKIHZvaWQgSURCQ3Vyc29yOjp1bmNoZWNrZWRJdGVy YXRlQ3Vyc29yKGNvbnN0IElEQktleURhdGEmIGtleSwgY29uc3QgSURCS2V5RGF0YSYgcHJpbWFy eUtleSkKIHsKKyAgICBBU1NFUlQobV9yZXF1ZXN0KTsKICAgICBBU1NFUlQoJmVmZmVjdGl2ZU9i amVjdFN0b3JlKCkudHJhbnNhY3Rpb24oKS5kYXRhYmFzZSgpLm9yaWdpblRocmVhZCgpID09ICZU aHJlYWQ6OmN1cnJlbnQoKSk7CiAKICAgICArK21fb3V0c3RhbmRpbmdSZXF1ZXN0Q291bnQ7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJDdXJzb3IuaCBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkN1cnNvci5oCmluZGV4IDQ5MDMw NTY5OTExYTc3OTc5ZWFkZGQ5MzRhZTA0ODBjNDI4NDE4ODYuLmJiN2UxMGQyZThlZjI5OGEyODBk NzM5YjBjMTYxZTE4N2Q3MzdjNzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL0lEQkN1cnNvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL0lEQkN1cnNvci5oCkBAIC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSAiSURCQ3Vyc29ySW5m by5oIgogI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL1N0cm9uZy5oPgogI2luY2x1ZGUgPHd0Zi9W YXJpYW50Lmg+CisjaW5jbHVkZSA8d3RmL1dlYWtQdHIuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUg ewogCkBAIC02Niw5ICs2Nyw5IEBAIHB1YmxpYzoKIAogICAgIGNvbnN0IElEQkN1cnNvckluZm8m IGluZm8oKSBjb25zdCB7IHJldHVybiBtX2luZm87IH0KIAotICAgIHZvaWQgc2V0UmVxdWVzdChJ REJSZXF1ZXN0JiByZXF1ZXN0KSB7IG1fcmVxdWVzdCA9ICZyZXF1ZXN0OyB9Ci0gICAgdm9pZCBj bGVhclJlcXVlc3QoKSB7IG1fcmVxdWVzdCA9IG51bGxwdHI7IH0KLSAgICBJREJSZXF1ZXN0KiBy ZXF1ZXN0KCkgeyByZXR1cm4gbV9yZXF1ZXN0OyB9CisgICAgdm9pZCBzZXRSZXF1ZXN0KElEQlJl cXVlc3QmIHJlcXVlc3QpIHsgbV9yZXF1ZXN0ID0gbWFrZVdlYWtQdHIoJnJlcXVlc3QpOyB9Cisg ICAgdm9pZCBjbGVhclJlcXVlc3QoKSB7IG1fcmVxdWVzdC5jbGVhcigpOyB9CisgICAgSURCUmVx dWVzdCogcmVxdWVzdCgpIHsgcmV0dXJuIG1fcmVxdWVzdC5nZXQoKTsgfQogCiAgICAgdm9pZCBz ZXRHZXRSZXN1bHQoSURCUmVxdWVzdCYsIGNvbnN0IElEQkdldFJlc3VsdCYpOwogCkBAIC05OCw3 ICs5OSw3IEBAIHByaXZhdGU6CiAKICAgICBJREJDdXJzb3JJbmZvIG1faW5mbzsKICAgICBTb3Vy Y2UgbV9zb3VyY2U7Ci0gICAgSURCUmVxdWVzdCogbV9yZXF1ZXN0IHsgbnVsbHB0ciB9OworICAg IFdlYWtQdHI8SURCUmVxdWVzdD4gbV9yZXF1ZXN0OwogCiAgICAgYm9vbCBtX2dvdFZhbHVlIHsg ZmFsc2UgfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIv SURCUmVxdWVzdC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCUmVxdWVz dC5oCmluZGV4IGU5MTQzNDRmZThkZmRjNGQwNmEwNjg0MTEyZWE2N2YwNDJmMWM2YzMuLjAwNjE1 NjZjZjFmZmQ4MWI2MzI1M2ZmYjM5OTdjZjZkNTg0YjI1YTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlJlcXVlc3QuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJSZXF1ZXN0LmgKQEAgLTM2LDYgKzM2LDcgQEAKICNpbmNs dWRlIDxKYXZhU2NyaXB0Q29yZS9TdHJvbmcuaD4KICNpbmNsdWRlIDx3dGYvRnVuY3Rpb24uaD4K ICNpbmNsdWRlIDx3dGYvU2NvcGUuaD4KKyNpbmNsdWRlIDx3dGYvV2Vha1B0ci5oPgogCiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKQEAgLTU2LDcgKzU3LDcgQEAgY2xhc3MgSURCQ29ubmVjdGlvblBy b3h5OwogY2xhc3MgSURCQ29ubmVjdGlvblRvU2VydmVyOwogfQogCi1jbGFzcyBJREJSZXF1ZXN0 IDogcHVibGljIEV2ZW50VGFyZ2V0V2l0aElubGluZURhdGEsIHB1YmxpYyBJREJBY3RpdmVET01P YmplY3QsIHB1YmxpYyBSZWZDb3VudGVkPElEQlJlcXVlc3Q+IHsKK2NsYXNzIElEQlJlcXVlc3Qg OiBwdWJsaWMgRXZlbnRUYXJnZXRXaXRoSW5saW5lRGF0YSwgcHVibGljIElEQkFjdGl2ZURPTU9i amVjdCwgcHVibGljIFJlZkNvdW50ZWQ8SURCUmVxdWVzdD4sIHB1YmxpYyBDYW5NYWtlV2Vha1B0 cjxJREJSZXF1ZXN0PiB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFJlZjxJREJSZXF1ZXN0PiBjcmVh dGUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYsIElEQk9iamVjdFN0b3JlJiwgSURCVHJhbnNhY3Rp b24mKTsKICAgICBzdGF0aWMgUmVmPElEQlJlcXVlc3Q+IGNyZWF0ZShTY3JpcHRFeGVjdXRpb25D b250ZXh0JiwgSURCQ3Vyc29yJiwgSURCVHJhbnNhY3Rpb24mKTsK