115185 2013-04-25 10:15:50 -0700 Thread safety issues in WKCustomProtocol 2013-04-25 10:58:12 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Mac All RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson aestes darin sam oldest_to_newest 881333 0 beidson 2013-04-25 10:15:50 -0700 Thread safety issues in WKCustomProtocol WebKit2's custom protocol management needs to coordinate access to the m_customProtocolMap In radar as <rdar://problem/13247304> 881336 1 199681 beidson 2013-04-25 10:22:23 -0700 Created attachment 199681 Patch v1 881350 2 199681 ap 2013-04-25 10:45:25 -0700 Comment on attachment 199681 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=199681&action=review r=me assuming WKCustomProtocol is ThreadSafeRefCounted. > Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h:101 > + RetainPtr<WKCustomProtocol> protocolForID(uint64_t customProtocolID); I'd add a comment explaining the RetainPtr. Looking at it, I already foolishly want to remove it :) 881353 3 beidson 2013-04-25 10:52:51 -0700 (In reply to comment #2) > (From update of attachment 199681 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=199681&action=review > > r=me assuming WKCustomProtocol is ThreadSafeRefCounted. It is - of course - an Obj-C class and therefore its Retain counting is thread safe. > > > Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h:101 > > + RetainPtr<WKCustomProtocol> protocolForID(uint64_t customProtocolID); > > I'd add a comment explaining the RetainPtr. Looking at it, I already foolishly want to remove it :) Indeed! Thanks! 881359 4 beidson 2013-04-25 10:58:12 -0700 http://trac.webkit.org/changeset/149121 199681 2013-04-25 10:22:23 -0700 2013-04-25 10:45:25 -0700 Patch v1 patch text/plain 5976 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzMjQ1MzVlLi4wOWMwOWU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTMtMDQtMjUgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIFRocmVhZCBzYWZldHkgaXNzdWVzIGluIFdLQ3VzdG9tUHJvdG9jb2wuCisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS8xMzI0NzMwND4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMTUxODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFNoYXJlZC9OZXR3b3JrL0N1c3RvbVByb3RvY29scy9DdXN0b21Qcm90b2Nv bE1hbmFnZXIuaDoKKworICAgICAgICAqIFNoYXJlZC9OZXR3b3JrL0N1c3RvbVByb3RvY29scy9t YWMvQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpDdXN0b21Q cm90b2NvbE1hbmFnZXI6OmFkZEN1c3RvbVByb3RvY29sKTogUHJvdGVjdCBtX2N1c3RvbVByb3Rv Y29sTWFwIHdpdGggaXRzIG11dGV4LgorICAgICAgICAoV2ViS2l0OjpDdXN0b21Qcm90b2NvbE1h bmFnZXI6OnJlbW92ZUN1c3RvbVByb3RvY29sKTogRGl0dG8uCisgICAgICAgIChXZWJLaXQ6OkN1 c3RvbVByb3RvY29sTWFuYWdlcjo6ZGlkRmFpbFdpdGhFcnJvcik6CisgICAgICAgIChXZWJLaXQ6 OkN1c3RvbVByb3RvY29sTWFuYWdlcjo6ZGlkTG9hZERhdGEpOgorICAgICAgICAoV2ViS2l0OjpD dXN0b21Qcm90b2NvbE1hbmFnZXI6OmRpZFJlY2VpdmVSZXNwb25zZSk6CisgICAgICAgIChXZWJL aXQ6OkN1c3RvbVByb3RvY29sTWFuYWdlcjo6ZGlkRmluaXNoTG9hZGluZyk6CisgICAgICAgIChX ZWJLaXQ6OkN1c3RvbVByb3RvY29sTWFuYWdlcjo6cHJvdG9jb2xGb3JJRCk6IFByb3RlY3QgbV9j dXN0b21Qcm90b2NvbE1hcCB3aXRoIGl0cyBtdXRleCwgYW5kIHJldHVybgorICAgICAgICAgIGEg UmV0YWluUHRyIGluc3RlYWQgb2YgYSByYXcgcG9pbnRlci4KKwogMjAxMy0wNC0yNCAgSmVyIE5v YmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBGdXJ0aGVyIHVucmV2aWV3ZWQg YnVpbGQgZml4OyBDRk5ldHdvcmsuZnJhbWV3b3JrIGlzIHRoZSBvbmUgd2hpY2ggTGlvbgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvQ3VzdG9tUHJvdG9jb2xzL0N1 c3RvbVByb3RvY29sTWFuYWdlci5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvQ3Vz dG9tUHJvdG9jb2xzL0N1c3RvbVByb3RvY29sTWFuYWdlci5oCmluZGV4IDRiNTk3NjEuLjg5ODJi ODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9OZXR3b3JrL0N1c3RvbVByb3Rv Y29scy9DdXN0b21Qcm90b2NvbE1hbmFnZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv TmV0d29yay9DdXN0b21Qcm90b2NvbHMvQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyLmgKQEAgLTMyLDYg KzMyLDcgQEAKICNpbmNsdWRlICJOZXR3b3JrUHJvY2Vzc1N1cHBsZW1lbnQuaCIKICNpbmNsdWRl ICJXZWJQcm9jZXNzU3VwcGxlbWVudC5oIgogI2luY2x1ZGUgPHd0Zi9IYXNoU2V0Lmg+CisjaW5j bHVkZSA8d3RmL1RocmVhZGluZy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgog CiAjaWYgUExBVEZPUk0oTUFDKQpAQCAtOTYsNyArOTcsOCBAQCBwcml2YXRlOgogI2lmIFBMQVRG T1JNKE1BQykKICAgICB0eXBlZGVmIEhhc2hNYXA8dWludDY0X3QsIFJldGFpblB0cjxXS0N1c3Rv bVByb3RvY29sPiA+IEN1c3RvbVByb3RvY29sTWFwOwogICAgIEN1c3RvbVByb3RvY29sTWFwIG1f Y3VzdG9tUHJvdG9jb2xNYXA7Ci0gICAgV0tDdXN0b21Qcm90b2NvbCAqcHJvdG9jb2xGb3JJRCh1 aW50NjRfdCBjdXN0b21Qcm90b2NvbElEKTsKKyAgICBNdXRleCBtX2N1c3RvbVByb3RvY29sTWFw TXV0ZXg7CisgICAgUmV0YWluUHRyPFdLQ3VzdG9tUHJvdG9jb2w+IHByb3RvY29sRm9ySUQodWlu dDY0X3QgY3VzdG9tUHJvdG9jb2xJRCk7CiAjZW5kaWYKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9OZXR3b3JrL0N1c3RvbVByb3RvY29scy9tYWMvQ3VzdG9tUHJvdG9j b2xNYW5hZ2VyTWFjLm1tIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvQ3VzdG9tUHJv dG9jb2xzL21hYy9DdXN0b21Qcm90b2NvbE1hbmFnZXJNYWMubW0KaW5kZXggNTkyMjI4ZS4uODJh YmM2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvQ3VzdG9tUHJv dG9jb2xzL21hYy9DdXN0b21Qcm90b2NvbE1hbmFnZXJNYWMubW0KKysrIGIvU291cmNlL1dlYktp dDIvU2hhcmVkL05ldHdvcmsvQ3VzdG9tUHJvdG9jb2xzL21hYy9DdXN0b21Qcm90b2NvbE1hbmFn ZXJNYWMubW0KQEAgLTE1MCwxMiArMTUwLDE0IEBAIHZvaWQgQ3VzdG9tUHJvdG9jb2xNYW5hZ2Vy Ojppbml0aWFsaXplKGNvbnN0IE5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJiBwCiB2 b2lkIEN1c3RvbVByb3RvY29sTWFuYWdlcjo6YWRkQ3VzdG9tUHJvdG9jb2woV0tDdXN0b21Qcm90 b2NvbCAqY3VzdG9tUHJvdG9jb2wpCiB7CiAgICAgQVNTRVJUKGN1c3RvbVByb3RvY29sKTsKKyAg ICBNdXRleExvY2tlciBsb2NrZXIobV9jdXN0b21Qcm90b2NvbE1hcE11dGV4KTsKICAgICBtX2N1 c3RvbVByb3RvY29sTWFwLmFkZChjdXN0b21Qcm90b2NvbC5jdXN0b21Qcm90b2NvbElELCBjdXN0 b21Qcm90b2NvbCk7CiB9CiAKIHZvaWQgQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyOjpyZW1vdmVDdXN0 b21Qcm90b2NvbChXS0N1c3RvbVByb3RvY29sICpjdXN0b21Qcm90b2NvbCkKIHsKICAgICBBU1NF UlQoY3VzdG9tUHJvdG9jb2wpOworICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX2N1c3RvbVByb3Rv Y29sTWFwTXV0ZXgpOwogICAgIG1fY3VzdG9tUHJvdG9jb2xNYXAucmVtb3ZlKGN1c3RvbVByb3Rv Y29sLmN1c3RvbVByb3RvY29sSUQpOwogfQogICAgIApAQCAtMTc2LDUwICsxNzgsNTIgQEAgYm9v bCBDdXN0b21Qcm90b2NvbE1hbmFnZXI6OnN1cHBvcnRzU2NoZW1lKGNvbnN0IFN0cmluZyYgc2No ZW1lKQogCiB2b2lkIEN1c3RvbVByb3RvY29sTWFuYWdlcjo6ZGlkRmFpbFdpdGhFcnJvcih1aW50 NjRfdCBjdXN0b21Qcm90b2NvbElELCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiBlcnJv cikKIHsKLSAgICBXS0N1c3RvbVByb3RvY29sICpwcm90b2NvbCA9IHByb3RvY29sRm9ySUQoY3Vz dG9tUHJvdG9jb2xJRCk7CisgICAgUmV0YWluUHRyPFdLQ3VzdG9tUHJvdG9jb2w+IHByb3RvY29s ID0gcHJvdG9jb2xGb3JJRChjdXN0b21Qcm90b2NvbElEKTsKICAgICBpZiAoIXByb3RvY29sKQog ICAgICAgICByZXR1cm47Ci0gICAgCi0gICAgW1twcm90b2NvbCBjbGllbnRdIFVSTFByb3RvY29s OnByb3RvY29sIGRpZEZhaWxXaXRoRXJyb3I6ZXJyb3IubnNFcnJvcigpXTsKLSAgICByZW1vdmVD dXN0b21Qcm90b2NvbChwcm90b2NvbCk7CisKKyAgICBbW3Byb3RvY29sLmdldCgpIGNsaWVudF0g VVJMUHJvdG9jb2w6cHJvdG9jb2wuZ2V0KCkgZGlkRmFpbFdpdGhFcnJvcjplcnJvci5uc0Vycm9y KCldOworICAgIHJlbW92ZUN1c3RvbVByb3RvY29sKHByb3RvY29sLmdldCgpKTsKIH0KIAogdm9p ZCBDdXN0b21Qcm90b2NvbE1hbmFnZXI6OmRpZExvYWREYXRhKHVpbnQ2NF90IGN1c3RvbVByb3Rv Y29sSUQsIGNvbnN0IENvcmVJUEM6OkRhdGFSZWZlcmVuY2UmIGRhdGEpCiB7Ci0gICAgV0tDdXN0 b21Qcm90b2NvbCAqcHJvdG9jb2wgPSBwcm90b2NvbEZvcklEKGN1c3RvbVByb3RvY29sSUQpOwor ICAgIFJldGFpblB0cjxXS0N1c3RvbVByb3RvY29sPiBwcm90b2NvbCA9IHByb3RvY29sRm9ySUQo Y3VzdG9tUHJvdG9jb2xJRCk7CiAgICAgaWYgKCFwcm90b2NvbCkKICAgICAgICAgcmV0dXJuOwog ICAgIAotICAgIFtbcHJvdG9jb2wgY2xpZW50XSBVUkxQcm90b2NvbDpwcm90b2NvbCBkaWRMb2Fk RGF0YTpbTlNEYXRhIGRhdGFXaXRoQnl0ZXM6KHZvaWQqKWRhdGEuZGF0YSgpIGxlbmd0aDpkYXRh LnNpemUoKV1dOworICAgIFtbcHJvdG9jb2wuZ2V0KCkgY2xpZW50XSBVUkxQcm90b2NvbDpwcm90 b2NvbC5nZXQoKSBkaWRMb2FkRGF0YTpbTlNEYXRhIGRhdGFXaXRoQnl0ZXM6KHZvaWQqKWRhdGEu ZGF0YSgpIGxlbmd0aDpkYXRhLnNpemUoKV1dOwogfQogCiB2b2lkIEN1c3RvbVByb3RvY29sTWFu YWdlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKHVpbnQ2NF90IGN1c3RvbVByb3RvY29sSUQsIGNvbnN0 IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCB1aW50MzJfdCBjYWNoZVN0b3Jh Z2VQb2xpY3kpCiB7Ci0gICAgV0tDdXN0b21Qcm90b2NvbCAqcHJvdG9jb2wgPSBwcm90b2NvbEZv cklEKGN1c3RvbVByb3RvY29sSUQpOworICAgIFJldGFpblB0cjxXS0N1c3RvbVByb3RvY29sPiBw cm90b2NvbCA9IHByb3RvY29sRm9ySUQoY3VzdG9tUHJvdG9jb2xJRCk7CiAgICAgaWYgKCFwcm90 b2NvbCkKICAgICAgICAgcmV0dXJuOwogICAgIAotICAgIFtbcHJvdG9jb2wgY2xpZW50XSBVUkxQ cm90b2NvbDpwcm90b2NvbCBkaWRSZWNlaXZlUmVzcG9uc2U6cmVzcG9uc2UubnNVUkxSZXNwb25z ZSgpIGNhY2hlU3RvcmFnZVBvbGljeTpzdGF0aWNfY2FzdDxOU1VSTENhY2hlU3RvcmFnZVBvbGlj eT4oY2FjaGVTdG9yYWdlUG9saWN5KV07CisgICAgW1twcm90b2NvbC5nZXQoKSBjbGllbnRdIFVS TFByb3RvY29sOnByb3RvY29sLmdldCgpIGRpZFJlY2VpdmVSZXNwb25zZTpyZXNwb25zZS5uc1VS TFJlc3BvbnNlKCkgY2FjaGVTdG9yYWdlUG9saWN5OnN0YXRpY19jYXN0PE5TVVJMQ2FjaGVTdG9y YWdlUG9saWN5PihjYWNoZVN0b3JhZ2VQb2xpY3kpXTsKIH0KIAogdm9pZCBDdXN0b21Qcm90b2Nv bE1hbmFnZXI6OmRpZEZpbmlzaExvYWRpbmcodWludDY0X3QgY3VzdG9tUHJvdG9jb2xJRCkKIHsK LSAgICBXS0N1c3RvbVByb3RvY29sICpwcm90b2NvbCA9IHByb3RvY29sRm9ySUQoY3VzdG9tUHJv dG9jb2xJRCk7CisgICAgUmV0YWluUHRyPFdLQ3VzdG9tUHJvdG9jb2w+IHByb3RvY29sID0gcHJv dG9jb2xGb3JJRChjdXN0b21Qcm90b2NvbElEKTsKICAgICBpZiAoIXByb3RvY29sKQogICAgICAg ICByZXR1cm47CiAgICAgCi0gICAgW1twcm90b2NvbCBjbGllbnRdIFVSTFByb3RvY29sRGlkRmlu aXNoTG9hZGluZzpwcm90b2NvbF07Ci0gICAgcmVtb3ZlQ3VzdG9tUHJvdG9jb2wocHJvdG9jb2wp OworICAgIFtbcHJvdG9jb2wuZ2V0KCkgY2xpZW50XSBVUkxQcm90b2NvbERpZEZpbmlzaExvYWRp bmc6cHJvdG9jb2wuZ2V0KCldOworICAgIHJlbW92ZUN1c3RvbVByb3RvY29sKHByb3RvY29sLmdl dCgpKTsKIH0KIAotV0tDdXN0b21Qcm90b2NvbCAqQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyOjpwcm90 b2NvbEZvcklEKHVpbnQ2NF90IGN1c3RvbVByb3RvY29sSUQpCitSZXRhaW5QdHI8V0tDdXN0b21Q cm90b2NvbD4gQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyOjpwcm90b2NvbEZvcklEKHVpbnQ2NF90IGN1 c3RvbVByb3RvY29sSUQpCiB7CisgICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1fY3VzdG9tUHJvdG9j b2xNYXBNdXRleCk7CisKICAgICBDdXN0b21Qcm90b2NvbE1hcDo6Y29uc3RfaXRlcmF0b3IgaXQg PSBtX2N1c3RvbVByb3RvY29sTWFwLmZpbmQoY3VzdG9tUHJvdG9jb2xJRCk7CiAgICAgaWYgKGl0 ID09IG1fY3VzdG9tUHJvdG9jb2xNYXAuZW5kKCkpCiAgICAgICAgIHJldHVybiBuaWw7CiAgICAg CiAgICAgQVNTRVJUKGl0LT52YWx1ZSk7Ci0gICAgcmV0dXJuIGl0LT52YWx1ZS5nZXQoKTsKKyAg ICByZXR1cm4gaXQtPnZhbHVlOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK