57155 2011-03-26 11:18:46 -0700 Fix a possible deadlock when two synchronous messages are sent at the same time 2011-03-26 11:23:57 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 373917 0 andersca 2011-03-26 11:18:46 -0700 Fix a possible deadlock when two synchronouse messages are sent at the same time 373918 1 87030 andersca 2011-03-26 11:21:58 -0700 Created attachment 87030 Patch 373920 2 andersca 2011-03-26 11:23:57 -0700 Committed r82032: <http://trac.webkit.org/changeset/82032> 87030 2011-03-26 11:21:58 -0700 2011-03-26 11:23:08 -0700 Patch bug-57155-20110326112157.patch text/plain 6655 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyMDMxKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDMtMjYgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBGaXggYSBwb3NzaWJsZSBkZWFkbG9jayB3aGVuIHR3byBz eW5jaHJvbm91c2UgbWVzc2FnZXMgYXJlIHNlbnQgYXQgdGhlIHNhbWUgdGltZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTcxNTUKKworICAgICAgICBT aW1wbGlmeSBjb2RlIGFuZCBmaXggYSBwb3NzaWJsZSAoYWx0aG91Z2ggaGlnaGx5IGltcHJvYmFi bGUpIGRlYWQgbG9jay4KKworICAgICAgICAqIFBsYXRmb3JtL0NvcmVJUEMvQ29ubmVjdGlvbi5j cHA6CisgICAgICAgIE1ha2UgU3luY01lc3NhZ2VTdGF0ZSBhdG9taWNhbGx5IHJlZiBjb3VudGVk IHNpbmNlIGl0IGNhbiBiZSByZWYoKSdlZCBmcm9tIHRoZSBjb25uZWN0aW9uIHF1ZXVlLgorICAg ICAgICBHZXQgcmlkIG9mIG1fd2FpdEZvclN5bmNSZXBseUNvdW50IGFuZCBhZGQgbV9kaWRTY2hl ZHVsZURpc3BhdGNoTWVzc2FnZXNXb3JrLgorCisgICAgICAgIChDb3JlSVBDOjpDb25uZWN0aW9u OjpTeW5jTWVzc2FnZVN0YXRlOjpTeW5jTWVzc2FnZVN0YXRlKToKKyAgICAgICAgSW5pdGlhbGl6 ZSBtX2RpZFNjaGVkdWxlRGlzcGF0Y2hNZXNzYWdlc1dvcmsgdG8gZmFsc2UuCisKKyAgICAgICAg KENvcmVJUEM6OkNvbm5lY3Rpb246OlN5bmNNZXNzYWdlU3RhdGU6OnByb2Nlc3NJbmNvbWluZ01l c3NhZ2UpOgorICAgICAgICBpZiBtX2RpZFNjaGVkdWxlRGlzcGF0Y2hNZXNzYWdlc1dvcmsgaXMg ZmFsc2UsIHNjaGVkdWxlIGEgY2FsbCB0byBkaXNwYXRjaE1lc3NhZ2VBbmRSZXNldERpZFNjaGVk dWxlRGlzcGF0Y2hNZXNzYWdlc1dvcmsKKyAgICAgICAgb24gdGhlIGNsaWVudCBydW4gbG9vcC4K KworICAgICAgICAoQ29yZUlQQzo6Q29ubmVjdGlvbjo6U3luY01lc3NhZ2VTdGF0ZTo6ZGlzcGF0 Y2hNZXNzYWdlQW5kUmVzZXREaWRTY2hlZHVsZURpc3BhdGNoTWVzc2FnZXNXb3JrKToKKyAgICAg ICAgRGlzcGF0Y2ggbWVzc2FnZXMgYW5kIHNldCBtX2RpZFNjaGVkdWxlRGlzcGF0Y2hNZXNzYWdl c1dvcmsgYmFjayB0byBmYWxzZS4KKworICAgICAgICAoQ29yZUlQQzo6Q29ubmVjdGlvbjo6c2Vu ZFN5bmNNZXNzYWdlKToKKyAgICAgICAgUmVtb3ZlIGNhbGxzIHRvIGJlZ2luV2FpdEZvclN5bmNS ZXBseSBhbmQgZW5kV2FpdEZvclN5bmNSZXBseS4KKwogMjAxMS0wMy0yNSAgU2FtIFdlaW5pZyAg PHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkZWxlIFBldGVyc29uLgpJ bmRleDogU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9Db25uZWN0aW9uLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0Nvbm5lY3Rpb24uY3Bw CShyZXZpc2lvbiA4MjAzMCkKKysrIFNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvQ29u bmVjdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM2LDE0ICszNiwxMSBAQCB1c2luZyBuYW1l c3BhY2Ugc3RkOwogCiBuYW1lc3BhY2UgQ29yZUlQQyB7CiAKLWNsYXNzIENvbm5lY3Rpb246OlN5 bmNNZXNzYWdlU3RhdGUgOiBwdWJsaWMgUmVmQ291bnRlZDxDb25uZWN0aW9uOjpTeW5jTWVzc2Fn ZVN0YXRlPiB7CitjbGFzcyBDb25uZWN0aW9uOjpTeW5jTWVzc2FnZVN0YXRlIDogcHVibGljIFRo cmVhZFNhZmVSZWZDb3VudGVkPENvbm5lY3Rpb246OlN5bmNNZXNzYWdlU3RhdGU+IHsKIHB1Ymxp YzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxTeW5jTWVzc2FnZVN0YXRlPiBnZXRPckNyZWF0ZShS dW5Mb29wKik7CiAgICAgflN5bmNNZXNzYWdlU3RhdGUoKTsKIAotICAgIHZvaWQgYmVnaW5XYWl0 Rm9yU3luY1JlcGx5KCk7Ci0gICAgdm9pZCBlbmRXYWl0Rm9yU3luY1JlcGx5KCk7Ci0KICAgICB2 b2lkIHdha2VVcENsaWVudFJ1bkxvb3AoKQogICAgIHsKICAgICAgICAgbV93YWl0Rm9yU3luY1Jl cGx5U2VtYXBob3JlLnNpZ25hbCgpOwpAQCAtNzYsMTMgKzczLDE1IEBAIHByaXZhdGU6CiAgICAg ICAgIHJldHVybiBzeW5jTWVzc2FnZVN0YXRlTWFwTXV0ZXg7CiAgICAgfQogCisgICAgdm9pZCBk aXNwYXRjaE1lc3NhZ2VBbmRSZXNldERpZFNjaGVkdWxlRGlzcGF0Y2hNZXNzYWdlc1dvcmsoKTsK KwogICAgIFJ1bkxvb3AqIG1fcnVuTG9vcDsKICAgICBCaW5hcnlTZW1hcGhvcmUgbV93YWl0Rm9y U3luY1JlcGx5U2VtYXBob3JlOwogCi0gICAgLy8gUHJvdGVjdHMgbV93YWl0Rm9yU3luY1JlcGx5 Q291bnQgYW5kIG1fbWVzc2FnZXNUb0Rpc3BhdGNoV2hpbGVXYWl0aW5nRm9yU3luY1JlcGx5Lgor ICAgIC8vIFByb3RlY3RzIG1fZGlkU2NoZWR1bGVEaXNwYXRjaE1lc3NhZ2VzV29yayBhbmQgbV9t ZXNzYWdlc1RvRGlzcGF0Y2hXaGlsZVdhaXRpbmdGb3JTeW5jUmVwbHkuCiAgICAgTXV0ZXggbV9t dXRleDsKIAotICAgIHVuc2lnbmVkIG1fd2FpdEZvclN5bmNSZXBseUNvdW50OworICAgIGJvb2wg bV9kaWRTY2hlZHVsZURpc3BhdGNoTWVzc2FnZXNXb3JrOwogCiAgICAgc3RydWN0IENvbm5lY3Rp b25BbmRJbmNvbWluZ01lc3NhZ2UgewogICAgICAgICBDb25uZWN0aW9uKiBjb25uZWN0aW9uOwpA QCAtMTA5LDcgKzEwOCw3IEBAIFBhc3NSZWZQdHI8Q29ubmVjdGlvbjo6U3luY01lc3NhZ2VTdGF0 ZT4KIAogQ29ubmVjdGlvbjo6U3luY01lc3NhZ2VTdGF0ZTo6U3luY01lc3NhZ2VTdGF0ZShSdW5M b29wKiBydW5Mb29wKQogICAgIDogbV9ydW5Mb29wKHJ1bkxvb3ApCi0gICAgLCBtX3dhaXRGb3JT eW5jUmVwbHlDb3VudCgwKQorICAgICwgbV9kaWRTY2hlZHVsZURpc3BhdGNoTWVzc2FnZXNXb3Jr KGZhbHNlKQogewogfQogCkBAIC0xMjEsNDkgKzEyMCwyNyBAQCBDb25uZWN0aW9uOjpTeW5jTWVz c2FnZVN0YXRlOjp+U3luY01lc3NhCiAgICAgc3luY01lc3NhZ2VTdGF0ZU1hcCgpLnJlbW92ZSht X3J1bkxvb3ApOwogfQogCi12b2lkIENvbm5lY3Rpb246OlN5bmNNZXNzYWdlU3RhdGU6OmJlZ2lu V2FpdEZvclN5bmNSZXBseSgpCi17Ci0gICAgQVNTRVJUKFJ1bkxvb3A6OmN1cnJlbnQoKSA9PSBt X3J1bkxvb3ApOwotCi0gICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1fbXV0ZXgpOwotICAgIG1fd2Fp dEZvclN5bmNSZXBseUNvdW50Kys7Ci19Ci0KLXZvaWQgQ29ubmVjdGlvbjo6U3luY01lc3NhZ2VT dGF0ZTo6ZW5kV2FpdEZvclN5bmNSZXBseSgpCi17Ci0gICAgQVNTRVJUKFJ1bkxvb3A6OmN1cnJl bnQoKSA9PSBtX3J1bkxvb3ApOwotCi0gICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1fbXV0ZXgpOwot ICAgIEFTU0VSVChtX3dhaXRGb3JTeW5jUmVwbHlDb3VudCk7Ci0gICAgLS1tX3dhaXRGb3JTeW5j UmVwbHlDb3VudDsKLQotICAgIGlmIChtX3dhaXRGb3JTeW5jUmVwbHlDb3VudCkKLSAgICAgICAg cmV0dXJuOwotCi0gICAgLy8gRGlzcGF0Y2ggYW55IHJlbWFpbmluZyBpbmNvbWluZyBzeW5jIG1l c3NhZ2VzLgotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9tZXNzYWdlc1RvRGlzcGF0Y2hX aGlsZVdhaXRpbmdGb3JTeW5jUmVwbHkuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgQ29ubmVjdGlv bkFuZEluY29taW5nTWVzc2FnZSYgY29ubmVjdGlvbkFuZEluY29taW5nTWVzc2FnZSA9IG1fbWVz c2FnZXNUb0Rpc3BhdGNoV2hpbGVXYWl0aW5nRm9yU3luY1JlcGx5W2ldOwotICAgICAgICBjb25u ZWN0aW9uQW5kSW5jb21pbmdNZXNzYWdlLmNvbm5lY3Rpb24tPmVucXVldWVJbmNvbWluZ01lc3Nh Z2UoY29ubmVjdGlvbkFuZEluY29taW5nTWVzc2FnZS5pbmNvbWluZ01lc3NhZ2UpOwotICAgIH0K LQotICAgIG1fbWVzc2FnZXNUb0Rpc3BhdGNoV2hpbGVXYWl0aW5nRm9yU3luY1JlcGx5LmNsZWFy KCk7Ci19Ci0KIGJvb2wgQ29ubmVjdGlvbjo6U3luY01lc3NhZ2VTdGF0ZTo6cHJvY2Vzc0luY29t aW5nTWVzc2FnZShDb25uZWN0aW9uKiBjb25uZWN0aW9uLCBJbmNvbWluZ01lc3NhZ2UmIGluY29t aW5nTWVzc2FnZSkKIHsKICAgICBNZXNzYWdlSUQgbWVzc2FnZUlEID0gaW5jb21pbmdNZXNzYWdl Lm1lc3NhZ2VJRCgpOwogICAgIGlmICghbWVzc2FnZUlELnNob3VsZERpc3BhdGNoTWVzc2FnZVdo ZW5XYWl0aW5nRm9yU3luY1JlcGx5KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIE11 dGV4TG9ja2VyIGxvY2tlcihtX211dGV4KTsKLSAgICBpZiAoIW1fd2FpdEZvclN5bmNSZXBseUNv dW50KQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICBDb25uZWN0aW9uQW5kSW5jb21pbmdN ZXNzYWdlIGNvbm5lY3Rpb25BbmRJbmNvbWluZ01lc3NhZ2U7CiAgICAgY29ubmVjdGlvbkFuZElu Y29taW5nTWVzc2FnZS5jb25uZWN0aW9uID0gY29ubmVjdGlvbjsKICAgICBjb25uZWN0aW9uQW5k SW5jb21pbmdNZXNzYWdlLmluY29taW5nTWVzc2FnZSA9IGluY29taW5nTWVzc2FnZTsKIAotICAg IG1fbWVzc2FnZXNUb0Rpc3BhdGNoV2hpbGVXYWl0aW5nRm9yU3luY1JlcGx5LmFwcGVuZChjb25u ZWN0aW9uQW5kSW5jb21pbmdNZXNzYWdlKTsKKyAgICB7CisgICAgICAgIE11dGV4TG9ja2VyIGxv Y2tlcihtX211dGV4KTsKKyAgICAgICAgCisgICAgICAgIGlmICghbV9kaWRTY2hlZHVsZURpc3Bh dGNoTWVzc2FnZXNXb3JrKSB7CisgICAgICAgICAgICBtX3J1bkxvb3AtPnNjaGVkdWxlV29yayhX b3JrSXRlbTo6Y3JlYXRlKHRoaXMsICZTeW5jTWVzc2FnZVN0YXRlOjpkaXNwYXRjaE1lc3NhZ2VB bmRSZXNldERpZFNjaGVkdWxlRGlzcGF0Y2hNZXNzYWdlc1dvcmspKTsKKyAgICAgICAgICAgIG1f ZGlkU2NoZWR1bGVEaXNwYXRjaE1lc3NhZ2VzV29yayA9IHRydWU7CisgICAgICAgIH0KKworICAg ICAgICBtX21lc3NhZ2VzVG9EaXNwYXRjaFdoaWxlV2FpdGluZ0ZvclN5bmNSZXBseS5hcHBlbmQo Y29ubmVjdGlvbkFuZEluY29taW5nTWVzc2FnZSk7CisgICAgfQorCiAgICAgd2FrZVVwQ2xpZW50 UnVuTG9vcCgpOwogCiAgICAgcmV0dXJuIHRydWU7CkBAIC0xODYsNiArMTYzLDE3IEBAIHZvaWQg Q29ubmVjdGlvbjo6U3luY01lc3NhZ2VTdGF0ZTo6ZGlzcGEKICAgICB9CiB9CiAKK3ZvaWQgQ29u bmVjdGlvbjo6U3luY01lc3NhZ2VTdGF0ZTo6ZGlzcGF0Y2hNZXNzYWdlQW5kUmVzZXREaWRTY2hl ZHVsZURpc3BhdGNoTWVzc2FnZXNXb3JrKCkKK3sKKyAgICB7CisgICAgICAgIE11dGV4TG9ja2Vy IGxvY2tlcihtX211dGV4KTsKKyAgICAgICAgQVNTRVJUKG1fZGlkU2NoZWR1bGVEaXNwYXRjaE1l c3NhZ2VzV29yayk7CisgICAgICAgIG1fZGlkU2NoZWR1bGVEaXNwYXRjaE1lc3NhZ2VzV29yayA9 IGZhbHNlOworICAgIH0KKworICAgIGRpc3BhdGNoTWVzc2FnZXMoKTsKK30KKwogUGFzc1JlZlB0 cjxDb25uZWN0aW9uPiBDb25uZWN0aW9uOjpjcmVhdGVTZXJ2ZXJDb25uZWN0aW9uKElkZW50aWZp ZXIgaWRlbnRpZmllciwgQ2xpZW50KiBjbGllbnQsIFJ1bkxvb3AqIGNsaWVudFJ1bkxvb3ApCiB7 CiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBDb25uZWN0aW9uKGlkZW50aWZpZXIsIHRydWUsIGNs aWVudCwgY2xpZW50UnVuTG9vcCkpOwpAQCAtMzU3LDEwICszNDUsNiBAQCBQYXNzT3duUHRyPEFy Z3VtZW50RGVjb2Rlcj4gQ29ubmVjdGlvbjo6CiAgICAgICAgIG1fcGVuZGluZ1N5bmNSZXBsaWVz LmFwcGVuZChQZW5kaW5nU3luY1JlcGx5KHN5bmNSZXF1ZXN0SUQpKTsKICAgICB9CiAKLSAgICAv LyBXZSBoYXZlIHRvIGJlZ2luIHdhaXRpbmcgZm9yIHRoZSBzeW5jIHJlcGx5IGJlZm9yZSBzZW5k aW5nIHRoZSBtZXNzYWdlLCBpbiBjYXNlIHRoZSBvdGhlciBzaWRlCi0gICAgLy8gd291bGQgaGF2 ZSBzZW50IGEgcmVxdWVzdCBiZWZvcmUgdXMsIHdoaWNoIHdvdWxkIGxlYWQgdG8gYSBkZWFkbG9j ay4KLSAgICBtX3N5bmNNZXNzYWdlU3RhdGUtPmJlZ2luV2FpdEZvclN5bmNSZXBseSgpOwotCiAg ICAgLy8gRmlyc3Qgc2VuZCB0aGUgbWVzc2FnZS4KICAgICBtZXNzYWdlSUQgPSBtZXNzYWdlSUQu bWVzc2FnZUlEV2l0aEFkZGVkRmxhZ3MoTWVzc2FnZUlEOjpEaXNwYXRjaE1lc3NhZ2VXaGVuV2Fp dGluZ0ZvclN5bmNSZXBseSB8IE1lc3NhZ2VJRDo6U3luY01lc3NhZ2UpOwogICAgIHNlbmRNZXNz YWdlKG1lc3NhZ2VJRCwgZW5jb2Rlcik7CkBAIC0zNzcsOCArMzYxLDYgQEAgUGFzc093blB0cjxB cmd1bWVudERlY29kZXI+IENvbm5lY3Rpb246OgogICAgICAgICBtX3BlbmRpbmdTeW5jUmVwbGll cy5yZW1vdmVMYXN0KCk7CiAgICAgfQogCi0gICAgbV9zeW5jTWVzc2FnZVN0YXRlLT5lbmRXYWl0 Rm9yU3luY1JlcGx5KCk7Ci0KICAgICBpZiAoIXJlcGx5ICYmIG1fY2xpZW50KQogICAgICAgICBt X2NsaWVudC0+ZGlkRmFpbFRvU2VuZFN5bmNNZXNzYWdlKHRoaXMpOwogCg==