129631 2014-03-03 15:39:46 -0800 Web Inspector: Avoid too early deref caused by RemoteInspectorXPCConnection::close 2014-03-03 22:52:22 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 joepeck webkit-unassigned commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 986536 0 joepeck 2014-03-03 15:39:46 -0800 Overall, the multithreaded aspects of RemoteInspectorXPCConnection are too complicated. This should be simplified in someway. For now, address a couple possible issues: - multithreaded access to m_client (close(), and XPC event handler) - deref too early in close(), if close() is called, we will receive another XPC event (XPC_ERROR) - so deref after we receive the XPC_ERROR event 986538 1 webkit-bug-importer 2014-03-03 15:40:28 -0800 <rdar://problem/16216505> 986576 2 225713 joepeck 2014-03-03 16:50:15 -0800 Created attachment 225713 [PATCH] Proposed Fix 986685 3 225713 commit-queue 2014-03-03 22:52:20 -0800 Comment on attachment 225713 [PATCH] Proposed Fix Clearing flags on attachment: 225713 Committed r165040: <http://trac.webkit.org/changeset/165040> 986686 4 commit-queue 2014-03-03 22:52:22 -0800 All reviewed patches have been landed. Closing bug. 225713 2014-03-03 16:50:15 -0800 2014-03-03 22:52:20 -0800 [PATCH] Proposed Fix proposed-fix.patch text/plain 7179 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGYzODgxMzAuLjQ0M2FjNmIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE0LTAzLTAzICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQXZvaWQg dG9vIGVhcmx5IGRlcmVmIGNhdXNlZCBieSBSZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uOjpj bG9zZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5 NjMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXZv aWQgZGVyZWYoKSB0b28gZWFybHkgaWYgYSBjbGllbnQgY2FsbHMgY2xvc2UoKS4gVGhlIHhwY19j b25uZWN0aW9uX2Nsb3NlCisgICAgICAgIHdpbGwgY2F1c2UgYW5vdGhlciBYUENfRVJST1IgZXZl bnQgdG8gY29tZSBpbiBmcm9tIHRoZSBxdWV1ZSwgZGVyZWYgdGhlbi4KKyAgICAgICAgTGlrZXdp c2UsIHByb3RlY3QgbXVsdGl0aHJlYWRlZCBhY2Nlc3MgdG8gbV9jbGllbnQuIElmIGEgY2xpZW50 IGNhbGxzCisgICAgICAgIGNsb3NlKCkgd2Ugd2FudCB0byBpbW1lZGlhdGVseSBjbGVhciB0aGUg cG9pbnRlciB0byBwcmV2ZW50IGNhbGxzIHRvIGl0LgorCisgICAgICAgIE92ZXJhbGwgdGhlIG11 bHRpLXRocmVhZGluZyBhc3BlY3RzIG9mIFJlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb24gYXJl CisgICAgICAgIGdyb3dpbmcgdG9vIGNvbXBsaWNhdGVkIGZvciBwcm9iYWJseSBsaXR0bGUgYmVu ZWZpdC4gV2UgbWF5IHdhbnQgdG8KKyAgICAgICAgY2xlYW4gdGhpcyB1cCBsYXRlci4KKworICAg ICAgICAqIGluc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLm1tOgorICAgICAgICAoSW5z cGVjdG9yOjpSZW1vdGVJbnNwZWN0b3I6OnhwY0Nvbm5lY3Rpb25GYWlsZWQpOgorICAgICAgICAq IGluc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbi5oOgorICAgICAg ICAqIGluc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbi5tbToKKyAg ICAgICAgKEluc3BlY3Rvcjo6UmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbjo6UmVtb3RlSW5z cGVjdG9yWFBDQ29ubmVjdGlvbik6CisgICAgICAgIChJbnNwZWN0b3I6OlJlbW90ZUluc3BlY3Rv clhQQ0Nvbm5lY3Rpb246OmNsb3NlKToKKyAgICAgICAgKEluc3BlY3Rvcjo6UmVtb3RlSW5zcGVj dG9yWFBDQ29ubmVjdGlvbjo6Y2xvc2VPblF1ZXVlKToKKyAgICAgICAgKEluc3BlY3Rvcjo6UmVt b3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbjo6ZGVzZXJpYWxpemVNZXNzYWdlKToKKyAgICAgICAg KEluc3BlY3Rvcjo6UmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbjo6aGFuZGxlRXZlbnQpOgor ICAgICAgICAoSW5zcGVjdG9yOjpSZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uOjpzZW5kTWVz c2FnZSk6CisKIDIwMTQtMDItMjggIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNv bT4KIAogICAgICAgICBEZWFkbG9jayByZW1vdGVseSBpbnNwZWN0aW5nIGlPUyBTaW11bGF0b3IK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90 ZUluc3BlY3Rvci5tbSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1Jl bW90ZUluc3BlY3Rvci5tbQppbmRleCBlODM2OTFkLi5mMTYwMDY0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3IubW0KKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9y Lm1tCkBAIC0yNjUsNiArMjY1LDggQEAgdm9pZCBSZW1vdGVJbnNwZWN0b3I6OnhwY0Nvbm5lY3Rp b25SZWNlaXZlZE1lc3NhZ2UoUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbioKIHZvaWQgUmVt b3RlSW5zcGVjdG9yOjp4cGNDb25uZWN0aW9uRmFpbGVkKFJlbW90ZUluc3BlY3RvclhQQ0Nvbm5l Y3Rpb24qIGNvbm5lY3Rpb24pCiB7CiAgICAgc3RkOjpsb2NrX2d1YXJkPHN0ZDo6bXV0ZXg+IGxv Y2sobV9tdXRleCk7CisKKyAgICBBU1NFUlQoY29ubmVjdGlvbiA9PSBtX3hwY0Nvbm5lY3Rpb24p OwogICAgIGlmIChjb25uZWN0aW9uICE9IG1feHBjQ29ubmVjdGlvbikKICAgICAgICAgcmV0dXJu OwogCkBAIC0yNzYsMTAgKzI3OCw4IEBAIHZvaWQgUmVtb3RlSW5zcGVjdG9yOjp4cGNDb25uZWN0 aW9uRmFpbGVkKFJlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb24qIGNvbm5lY3RpCiAKICAgICB1 cGRhdGVIYXNBY3RpdmVEZWJ1Z1Nlc3Npb24oKTsKIAotICAgIGlmIChtX3hwY0Nvbm5lY3Rpb24p IHsKLSAgICAgICAgbV94cGNDb25uZWN0aW9uLT5jbG9zZSgpOwotICAgICAgICBtX3hwY0Nvbm5l Y3Rpb24gPSBudWxscHRyOwotICAgIH0KKyAgICAvLyBUaGUgY29ubmVjdGlvbiB3aWxsIGNsb3Nl IGl0c2VsZi4KKyAgICBtX3hwY0Nvbm5lY3Rpb24gPSBudWxscHRyOwogfQogCiB2b2lkIFJlbW90 ZUluc3BlY3Rvcjo6eHBjQ29ubmVjdGlvblVuaGFuZGxlZE1lc3NhZ2UoUmVtb3RlSW5zcGVjdG9y WFBDQ29ubmVjdGlvbiosIHhwY19vYmplY3RfdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb24uaCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3RvclhQ Q0Nvbm5lY3Rpb24uaAppbmRleCAxMDk5NTkzLi5iY2MwY2Q5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0 aW9uLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3Rl SW5zcGVjdG9yWFBDQ29ubmVjdGlvbi5oCkBAIC0yOSw2ICsyOSw3IEBACiAjZGVmaW5lIFJlbW90 ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb25faAogCiAjaW1wb3J0IDxkaXNwYXRjaC9kaXNwYXRjaC5o PgorI2ltcG9ydCA8bXV0ZXg+CiAjaW1wb3J0IDx3dGYvVGhyZWFkU2FmZVJlZkNvdW50ZWQuaD4K ICNpbXBvcnQgPHhwYy94cGMuaD4KIApAQCAtNTYsNiArNTcsMTEgQEAgcHVibGljOgogcHJpdmF0 ZToKICAgICBOU0RpY3Rpb25hcnkgKmRlc2VyaWFsaXplTWVzc2FnZSh4cGNfb2JqZWN0X3QpOwog ICAgIHZvaWQgaGFuZGxlRXZlbnQoeHBjX29iamVjdF90KTsKKyAgICB2b2lkIGNsb3NlT25RdWV1 ZSgpOworCisgICAgLy8gV2UgaGFuZGxlIFhQQyBldmVudHMgb24gdGhlIHF1ZXVlLCBidXQgYSBj bGllbnQgbWF5IGNhbGwgY2xvc2UoKSBvbiBhbnkgcXVldWUuCisgICAgLy8gV2UgbWFrZSBzdXJl IHRoYXQgbV9jbGllbnQgaXMgdGhyZWFkIHNhZmUgYW5kIGltbWVkaWF0ZWx5IGNsZWFyZWQgaW4g Y2xvc2UoKS4KKyAgICBzdGQ6Om11dGV4IG1fbXV0ZXg7CiAKICAgICB4cGNfY29ubmVjdGlvbl90 IG1fY29ubmVjdGlvbjsKICAgICBkaXNwYXRjaF9xdWV1ZV90IG1fcXVldWU7CmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3JY UENDb25uZWN0aW9uLm1tIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUv UmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbi5tbQppbmRleCAzY2E5ZWU4Li4yODk3OTVlIDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJ bnNwZWN0b3JYUENDb25uZWN0aW9uLm1tCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNw ZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb24ubW0KQEAgLTMwLDYgKzMw LDcgQEAKIAogI2ltcG9ydCA8Rm91bmRhdGlvbi9Gb3VuZGF0aW9uLmg+CiAjaW1wb3J0IDx3dGYv QXNzZXJ0aW9ucy5oPgorI2ltcG9ydCA8d3RmL1JlZi5oPgogCiAjaWYgX19oYXNfaW5jbHVkZSg8 Q29yZUZvdW5kYXRpb24vQ0ZYUENCcmlkZ2UuaD4pCiAjaW1wb3J0IDxDb3JlRm91bmRhdGlvbi9D RlhQQ0JyaWRnZS5oPgpAQCAtNTksNyArNjAsNyBAQCBSZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0 aW9uOjpSZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uKHhwY19jb25uZWN0aW9uX3QgY29ubgog ICAgICAgICBoYW5kbGVFdmVudChvYmplY3QpOwogICAgIH0pOwogCi0gICAgLy8gQmFsYW5jZWQg YnkgZGVyZWYgaW4gY2xvc2UuCisgICAgLy8gQmFsYW5jZWQgYnkgZGVyZWYgd2hlbiB0aGUgeHBj X2Nvbm5lY3Rpb24gcmVjZWl2ZXMgWFBDX0VSUk9SLgogICAgIHJlZigpOwogCiAgICAgeHBjX2Nv bm5lY3Rpb25fcmVzdW1lKG1fY29ubmVjdGlvbik7CkBAIC03NCwyNCArNzUsMzAgQEAgUmVtb3Rl SW5zcGVjdG9yWFBDQ29ubmVjdGlvbjo6flJlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb24oKQog CiB2b2lkIFJlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb246OmNsb3NlKCkKIHsKLSAgICBpZiAo bV9jbG9zZWQpCi0gICAgICAgIHJldHVybjsKKyAgICBzdGQ6OmxvY2tfZ3VhcmQ8c3RkOjptdXRl eD4gbG9jayhtX211dGV4KTsKIAogICAgIG1fY2xvc2VkID0gdHJ1ZTsKKyAgICBtX2NsaWVudCA9 IG51bGxwdHI7CiAKICAgICBkaXNwYXRjaF9hc3luYyhtX3F1ZXVlLCBeeworICAgICAgICBzdGQ6 OmxvY2tfZ3VhcmQ8c3RkOjptdXRleD4gbG9jayhtX211dGV4KTsKKyAgICAgICAgLy8gVGhpcyB3 aWxsIHRyaWdnZXIgb25lIGxhc3QgWFBDX0VSUk9SX0NPTk5FQ1RJT05fSU5WQUxJRCBldmVudCBv biB0aGUgcXVldWUgYW5kIGRlcmVmIHVzLgorICAgICAgICBjbG9zZU9uUXVldWUoKTsKKyAgICB9 KTsKK30KKwordm9pZCBSZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uOjpjbG9zZU9uUXVldWUo KQoreworICAgIGlmIChtX2Nvbm5lY3Rpb24pIHsKICAgICAgICAgeHBjX2Nvbm5lY3Rpb25fY2Fu Y2VsKG1fY29ubmVjdGlvbik7CiAgICAgICAgIHhwY19yZWxlYXNlKG1fY29ubmVjdGlvbik7CiAg ICAgICAgIG1fY29ubmVjdGlvbiA9IE5VTEw7CisgICAgfQogCisgICAgaWYgKG1fcXVldWUpIHsK ICAgICAgICAgZGlzcGF0Y2hfcmVsZWFzZShtX3F1ZXVlKTsKICAgICAgICAgbV9xdWV1ZSA9IE5V TEw7Ci0KLSAgICAgICAgbV9jbGllbnQgPSBudWxscHRyOwotCi0gICAgICAgIC8vIEJhbGFuY2Ug dGhlIHJlZiBpbiBvdXIgY29uc3RydWN0b3IuCi0gICAgICAgIGRlcmVmKCk7Ci0gICAgfSk7Cisg ICAgfQogfQogCiBOU0RpY3Rpb25hcnkgKlJlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb246OmRl c2VyaWFsaXplTWVzc2FnZSh4cGNfb2JqZWN0X3Qgb2JqZWN0KQpAQCAtMTAxLDYgKzEwOCw3IEBA IE5TRGljdGlvbmFyeSAqUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbjo6ZGVzZXJpYWxpemVN ZXNzYWdlKHhwY19vYmplY3RfdCBvYmplCiAKICAgICB4cGNfb2JqZWN0X3QgeHBjRGljdGlvbmFy eSA9IHhwY19kaWN0aW9uYXJ5X2dldF92YWx1ZShvYmplY3QsIFJlbW90ZUluc3BlY3RvclhQQ0Nv bm5lY3Rpb25TZXJpYWxpemVkTWVzc2FnZUtleSk7CiAgICAgaWYgKCF4cGNEaWN0aW9uYXJ5IHx8 IHhwY19nZXRfdHlwZSh4cGNEaWN0aW9uYXJ5KSAhPSBYUENfVFlQRV9ESUNUSU9OQVJZKSB7Cisg ICAgICAgIHN0ZDo6bG9ja19ndWFyZDxzdGQ6Om11dGV4PiBsb2NrKG1fbXV0ZXgpOwogICAgICAg ICBpZiAobV9jbGllbnQpCiAgICAgICAgICAgICBtX2NsaWVudC0+eHBjQ29ubmVjdGlvblVuaGFu ZGxlZE1lc3NhZ2UodGhpcywgb2JqZWN0KTsKICAgICAgICAgcmV0dXJuIG5pbDsKQEAgLTExNCw4 ICsxMjIsMTcgQEAgTlNEaWN0aW9uYXJ5ICpSZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uOjpk ZXNlcmlhbGl6ZU1lc3NhZ2UoeHBjX29iamVjdF90IG9iamUKIHZvaWQgUmVtb3RlSW5zcGVjdG9y WFBDQ29ubmVjdGlvbjo6aGFuZGxlRXZlbnQoeHBjX29iamVjdF90IG9iamVjdCkKIHsKICAgICBp ZiAoeHBjX2dldF90eXBlKG9iamVjdCkgPT0gWFBDX1RZUEVfRVJST1IpIHsKKyAgICAgICAgc3Rk Ojpsb2NrX2d1YXJkPHN0ZDo6bXV0ZXg+IGxvY2sobV9tdXRleCk7CiAgICAgICAgIGlmIChtX2Ns aWVudCkKICAgICAgICAgICAgIG1fY2xpZW50LT54cGNDb25uZWN0aW9uRmFpbGVkKHRoaXMpOwor CisgICAgICAgIG1fY2xvc2VkID0gdHJ1ZTsKKyAgICAgICAgbV9jbGllbnQgPSBudWxscHRyOwor ICAgICAgICBjbG9zZU9uUXVldWUoKTsKKworICAgICAgICAvLyBUaGlzIGlzIHRoZSBsYXN0IGV2 ZW50IHdlIHdpbGwgZXZlciByZWNlaXZlIGZyb20gdGhlIGNvbm5lY3Rpb24uCisgICAgICAgIC8v IEJhbGFuY2UgdGhlIHJlZigpIGluIHRoZSBjb25zdHJ1Y3Rvci4KKyAgICAgICAgZGVyZWYoKTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMTI1LDEyICsxNDIsMTQgQEAgdm9pZCBSZW1v dGVJbnNwZWN0b3JYUENDb25uZWN0aW9uOjpoYW5kbGVFdmVudCh4cGNfb2JqZWN0X3Qgb2JqZWN0 KQogCiAgICAgTlNTdHJpbmcgKm1lc3NhZ2UgPSBbZGF0YURpY3Rpb25hcnkgb2JqZWN0Rm9yS2V5 OlJlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb25NZXNzYWdlTmFtZUtleV07CiAgICAgTlNEaWN0 aW9uYXJ5ICp1c2VySW5mbyA9IFtkYXRhRGljdGlvbmFyeSBvYmplY3RGb3JLZXk6UmVtb3RlSW5z cGVjdG9yWFBDQ29ubmVjdGlvblVzZXJJbmZvS2V5XTsKKyAgICBzdGQ6OmxvY2tfZ3VhcmQ8c3Rk OjptdXRleD4gbG9jayhtX211dGV4KTsKICAgICBpZiAobV9jbGllbnQpCiAgICAgICAgIG1fY2xp ZW50LT54cGNDb25uZWN0aW9uUmVjZWl2ZWRNZXNzYWdlKHRoaXMsIG1lc3NhZ2UsIHVzZXJJbmZv KTsKIH0KIAogdm9pZCBSZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uOjpzZW5kTWVzc2FnZShO U1N0cmluZyAqbWVzc2FnZU5hbWUsIE5TRGljdGlvbmFyeSAqdXNlckluZm8pCiB7CisgICAgQVNT RVJUKCFtX2Nsb3NlZCk7CiAgICAgaWYgKG1fY2xvc2VkKQogICAgICAgICByZXR1cm47CiAK