148229 2015-08-20 10:06:25 -0700 dispatch_group_t objects may not be retained properly when not backed by Objective-C objects under garbage collection 2015-08-21 11:37:43 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ddkilzer ddkilzer aestes andersca bfulgham commit-queue eric.carlson jeremyj-wk jer.noble oldest_to_newest 1119275 0 ddkilzer 2015-08-20 10:06:25 -0700 dispatch_group_t objects may not be retained properly when not backed by Objective-C objects under garbage collection. The proper way to address this is to use OSObjectPtr<>, which does the right thing regardless of whether the dispatch_group_t objects are backed by Objective-C objects or not. 1119795 1 259630 ddkilzer 2015-08-21 10:35:12 -0700 Created attachment 259630 Patch 1119802 2 259630 ddkilzer 2015-08-21 10:43:15 -0700 Comment on attachment 259630 Patch I forgot to include the header! 1119805 3 259631 ddkilzer 2015-08-21 10:44:54 -0700 Created attachment 259631 Patch v2 1119828 4 259631 commit-queue 2015-08-21 11:37:40 -0700 Comment on attachment 259631 Patch v2 Clearing flags on attachment: 259631 Committed r188761: <http://trac.webkit.org/changeset/188761> 1119829 5 commit-queue 2015-08-21 11:37:43 -0700 All reviewed patches have been landed. Closing bug. 259630 2015-08-21 10:35:12 -0700 2015-08-21 10:44:51 -0700 Patch bug-148229-20150821103506.patch text/plain 3621 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3NTA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmUwNzE1MDM5NmU2YTIz MzllODc5YzNkZGEwZTUyNDgzYzQ2YjdkZS4uZjAwNWM0YjQ2YzhmMDUzNzg2ZmJkYWEwYjRjMzg1 YzQ1YjYyYWMzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA4LTIxICBEYXZp ZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAgICAgICAgZGlzcGF0Y2hfZ3JvdXBf dCBvYmplY3RzIG1heSBub3QgYmUgcmV0YWluZWQgcHJvcGVybHkgd2hlbiBub3QgYmFja2VkIGJ5 IE9iamVjdGl2ZS1DIG9iamVjdHMgdW5kZXIgZ2FyYmFnZSBjb2xsZWN0aW9uCisgICAgICAgIDxo dHRwOi8vd2Via2l0Lm9yZy9iLzE0ODIyOT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXaGVuIGNvbXBpbGVkIHdpdGggZ2FyYmFnZSBjb2xsZWN0aW9u IGVuYWJsZWQsIGxpYmRpc3BhdGNoCisgICAgICAgIG9iamVjdHMgYXJlIG5vdCBiYWNrZWQgYnkg T2JqZWN0aXZlLUMgb2JqZWN0cywgc28gdGhleSBkb24ndCBnZXQKKyAgICAgICAgdGhlIGJlbmVm aXQgb2YgYXV0b21hdGljIHJlZmVyZW5jZSBjb3VudGluZyB3aGVuIGNhcHR1cmVkIGJ5IGEKKyAg ICAgICAgYmxvY2sgb3IgYSBsYW1iZGEuICBUbyBhZGRyZXNzIHRoaXMsIHdlIHVzZSBPU09iamVj dFB0cjw+IHdoaWNoCisgICAgICAgIGFsd2F5cyBpbmNyZW1lbnRzIHRoZSByZWZlcmVuY2UgY291 bnQgb2YgdGhlIGNvbnRhaW5lZCBvYmplY3QuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1t OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6 YmVnaW5Mb2FkaW5nTWV0YWRhdGEpOgorICAgICAgICBTd2l0Y2ggdG8gdXNlIE9TT2JqZWN0UHRy PD4uCisKIDIwMTUtMDctMjggIFNhaWQgQWJvdS1IYWxsYXdhICA8c2Fib3VoYWxsYXdhQGFwcGxl LmNvbT4KIAogICAgICAgICBDcmFzaCBoYXBwZW5zIHdoZW4gY2FsbGluZyByZW1vdmVFdmVudExp c3RlbmVyIGZvciBhbiBTVkcgZWxlbWVudCB3aGljaCBoYXMgYW4gaW5zdGFuY2UgaW5zaWRlIGEg PGRlZnM+IGVsZW1lbnQgb2Ygc2hhZG93IHRyZWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFW Rm91bmRhdGlvbk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCmluZGV4 IGU5OGRmZDlhZmMxYWE3ZjQzMzg1YmFkZDA4NmU3ODNhNWI1ZDM0ODAuLjFjODdkYTNkMjFkMGJj NDMyZGZmZjJiMzgwZjBiNTVmZDAzZDNmYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91 bmRhdGlvbk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQpAQCAt MTA0NCwzMSArMTA0NCwyOSBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9i akM6OmJlZ2luTG9hZGluZ01ldGFkYXRhKCkKIHsKICAgICBMT0coTWVkaWEsICJNZWRpYVBsYXll clByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpiZWdpbkxvYWRpbmdNZXRhZGF0YSglcCkgLSByZXF1 ZXN0aW5nIG1ldGFkYXRhIGxvYWRpbmciLCB0aGlzKTsKIAotICAgIGRpc3BhdGNoX2dyb3VwX3Qg bWV0YWRhdGFMb2FkaW5nR3JvdXAgPSBkaXNwYXRjaF9ncm91cF9jcmVhdGUoKTsKLSAgICBkaXNw YXRjaF9ncm91cF9lbnRlcihtZXRhZGF0YUxvYWRpbmdHcm91cCk7CisgICAgT1NPYmplY3RQdHI8 ZGlzcGF0Y2hfZ3JvdXBfdD4gbWV0YWRhdGFMb2FkaW5nR3JvdXAgPSBhZG9wdE9TT2JqZWN0KGRp c3BhdGNoX2dyb3VwX2NyZWF0ZSgpKTsKKyAgICBkaXNwYXRjaF9ncm91cF9lbnRlcihtZXRhZGF0 YUxvYWRpbmdHcm91cC5nZXQoKSk7CiAgICAgYXV0byB3ZWFrVGhpcyA9IGNyZWF0ZVdlYWtQdHIo KTsKICAgICBbbV9hdkFzc2V0LmdldCgpIGxvYWRWYWx1ZXNBc3luY2hyb25vdXNseUZvcktleXM6 YXNzZXRNZXRhZGF0YUtleU5hbWVzKCkgY29tcGxldGlvbkhhbmRsZXI6XnsKIAogICAgICAgICBj YWxsT25NYWluVGhyZWFkKFt3ZWFrVGhpcywgbWV0YWRhdGFMb2FkaW5nR3JvdXBdIHsKICAgICAg ICAgICAgIGlmICh3ZWFrVGhpcyAmJiBbd2Vha1RoaXMtPm1fYXZBc3NldC5nZXQoKSBzdGF0dXNP ZlZhbHVlRm9yS2V5OkAidHJhY2tzIiBlcnJvcjpuaWxdID09IEFWS2V5VmFsdWVTdGF0dXNMb2Fk ZWQpIHsKICAgICAgICAgICAgICAgICBmb3IgKEFWQXNzZXRUcmFjayAqdHJhY2sgaW4gW3dlYWtU aGlzLT5tX2F2QXNzZXQuZ2V0KCkgdHJhY2tzXSkgewotICAgICAgICAgICAgICAgICAgICBkaXNw YXRjaF9ncm91cF9lbnRlcihtZXRhZGF0YUxvYWRpbmdHcm91cCk7CisgICAgICAgICAgICAgICAg ICAgIGRpc3BhdGNoX2dyb3VwX2VudGVyKG1ldGFkYXRhTG9hZGluZ0dyb3VwLmdldCgpKTsKICAg ICAgICAgICAgICAgICAgICAgW3RyYWNrIGxvYWRWYWx1ZXNBc3luY2hyb25vdXNseUZvcktleXM6 YXNzZXRUcmFja01ldGFkYXRhS2V5TmFtZXMoKSBjb21wbGV0aW9uSGFuZGxlcjpeewotICAgICAg ICAgICAgICAgICAgICAgICAgZGlzcGF0Y2hfZ3JvdXBfbGVhdmUobWV0YWRhdGFMb2FkaW5nR3Jv dXApOworICAgICAgICAgICAgICAgICAgICAgICAgZGlzcGF0Y2hfZ3JvdXBfbGVhdmUobWV0YWRh dGFMb2FkaW5nR3JvdXAuZ2V0KCkpOwogICAgICAgICAgICAgICAgICAgICB9XTsKICAgICAgICAg ICAgICAgICB9CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBkaXNwYXRjaF9ncm91cF9sZWF2 ZShtZXRhZGF0YUxvYWRpbmdHcm91cCk7CisgICAgICAgICAgICBkaXNwYXRjaF9ncm91cF9sZWF2 ZShtZXRhZGF0YUxvYWRpbmdHcm91cC5nZXQoKSk7CiAgICAgICAgIH0pOwogICAgIH1dOwogCi0g ICAgZGlzcGF0Y2hfZ3JvdXBfbm90aWZ5KG1ldGFkYXRhTG9hZGluZ0dyb3VwLCBkaXNwYXRjaF9n ZXRfbWFpbl9xdWV1ZSgpLCBeeworICAgIGRpc3BhdGNoX2dyb3VwX25vdGlmeShtZXRhZGF0YUxv YWRpbmdHcm91cC5nZXQoKSwgZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKICAgICAgICAg Y2FsbE9uTWFpblRocmVhZChbd2Vha1RoaXNdIHsKICAgICAgICAgICAgIGlmICh3ZWFrVGhpcykK ICAgICAgICAgICAgICAgICBbd2Vha1RoaXMtPm1fb2JqY09ic2VydmVyLmdldCgpIG1ldGFkYXRh TG9hZGVkXTsKICAgICAgICAgfSk7Ci0KLSAgICAgICAgZGlzcGF0Y2hfcmVsZWFzZShtZXRhZGF0 YUxvYWRpbmdHcm91cCk7CiAgICAgfSk7CiB9CiAK 259631 2015-08-21 10:44:54 -0700 2015-08-21 11:37:40 -0700 Patch v2 bug-148229-20150821104448.patch text/plain 3826 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3NTA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmUwNzE1MDM5NmU2YTIz MzllODc5YzNkZGEwZTUyNDgzYzQ2YjdkZS4uZjAwNWM0YjQ2YzhmMDUzNzg2ZmJkYWEwYjRjMzg1 YzQ1YjYyYWMzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA4LTIxICBEYXZp ZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAgICAgICAgZGlzcGF0Y2hfZ3JvdXBf dCBvYmplY3RzIG1heSBub3QgYmUgcmV0YWluZWQgcHJvcGVybHkgd2hlbiBub3QgYmFja2VkIGJ5 IE9iamVjdGl2ZS1DIG9iamVjdHMgdW5kZXIgZ2FyYmFnZSBjb2xsZWN0aW9uCisgICAgICAgIDxo dHRwOi8vd2Via2l0Lm9yZy9iLzE0ODIyOT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXaGVuIGNvbXBpbGVkIHdpdGggZ2FyYmFnZSBjb2xsZWN0aW9u IGVuYWJsZWQsIGxpYmRpc3BhdGNoCisgICAgICAgIG9iamVjdHMgYXJlIG5vdCBiYWNrZWQgYnkg T2JqZWN0aXZlLUMgb2JqZWN0cywgc28gdGhleSBkb24ndCBnZXQKKyAgICAgICAgdGhlIGJlbmVm aXQgb2YgYXV0b21hdGljIHJlZmVyZW5jZSBjb3VudGluZyB3aGVuIGNhcHR1cmVkIGJ5IGEKKyAg ICAgICAgYmxvY2sgb3IgYSBsYW1iZGEuICBUbyBhZGRyZXNzIHRoaXMsIHdlIHVzZSBPU09iamVj dFB0cjw+IHdoaWNoCisgICAgICAgIGFsd2F5cyBpbmNyZW1lbnRzIHRoZSByZWZlcmVuY2UgY291 bnQgb2YgdGhlIGNvbnRhaW5lZCBvYmplY3QuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1t OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6 YmVnaW5Mb2FkaW5nTWV0YWRhdGEpOgorICAgICAgICBTd2l0Y2ggdG8gdXNlIE9TT2JqZWN0UHRy PD4uCisKIDIwMTUtMDctMjggIFNhaWQgQWJvdS1IYWxsYXdhICA8c2Fib3VoYWxsYXdhQGFwcGxl LmNvbT4KIAogICAgICAgICBDcmFzaCBoYXBwZW5zIHdoZW4gY2FsbGluZyByZW1vdmVFdmVudExp c3RlbmVyIGZvciBhbiBTVkcgZWxlbWVudCB3aGljaCBoYXMgYW4gaW5zdGFuY2UgaW5zaWRlIGEg PGRlZnM+IGVsZW1lbnQgb2Ygc2hhZG93IHRyZWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFW Rm91bmRhdGlvbk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCmluZGV4 IGU5OGRmZDlhZmMxYWE3ZjQzMzg1YmFkZDA4NmU3ODNhNWI1ZDM0ODAuLmM2NDUwZTdkYjk3ODEw MTJlOTAwZDQ2ZmE0M2E3YWUxMjA3NDQ4N2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91 bmRhdGlvbk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQpAQCAt NzIsNiArNzIsNyBAQAogI2ltcG9ydCA8d3RmL0N1cnJlbnRUaW1lLmg+CiAjaW1wb3J0IDx3dGYv TGlzdEhhc2hTZXQuaD4KICNpbXBvcnQgPHd0Zi9OZXZlckRlc3Ryb3llZC5oPgorI2ltcG9ydCA8 d3RmL09TT2JqZWN0UHRyLmg+CiAjaW1wb3J0IDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAjaW1wb3J0 IDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CiAKQEAgLTEwNDQsMzEgKzEwNDUsMjkgQEAgdm9p ZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpiZWdpbkxvYWRpbmdNZXRhZGF0 YSgpCiB7CiAgICAgTE9HKE1lZGlhLCAiTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2Jq Qzo6YmVnaW5Mb2FkaW5nTWV0YWRhdGEoJXApIC0gcmVxdWVzdGluZyBtZXRhZGF0YSBsb2FkaW5n IiwgdGhpcyk7CiAKLSAgICBkaXNwYXRjaF9ncm91cF90IG1ldGFkYXRhTG9hZGluZ0dyb3VwID0g ZGlzcGF0Y2hfZ3JvdXBfY3JlYXRlKCk7Ci0gICAgZGlzcGF0Y2hfZ3JvdXBfZW50ZXIobWV0YWRh dGFMb2FkaW5nR3JvdXApOworICAgIE9TT2JqZWN0UHRyPGRpc3BhdGNoX2dyb3VwX3Q+IG1ldGFk YXRhTG9hZGluZ0dyb3VwID0gYWRvcHRPU09iamVjdChkaXNwYXRjaF9ncm91cF9jcmVhdGUoKSk7 CisgICAgZGlzcGF0Y2hfZ3JvdXBfZW50ZXIobWV0YWRhdGFMb2FkaW5nR3JvdXAuZ2V0KCkpOwog ICAgIGF1dG8gd2Vha1RoaXMgPSBjcmVhdGVXZWFrUHRyKCk7CiAgICAgW21fYXZBc3NldC5nZXQo KSBsb2FkVmFsdWVzQXN5bmNocm9ub3VzbHlGb3JLZXlzOmFzc2V0TWV0YWRhdGFLZXlOYW1lcygp IGNvbXBsZXRpb25IYW5kbGVyOl57CiAKICAgICAgICAgY2FsbE9uTWFpblRocmVhZChbd2Vha1Ro aXMsIG1ldGFkYXRhTG9hZGluZ0dyb3VwXSB7CiAgICAgICAgICAgICBpZiAod2Vha1RoaXMgJiYg W3dlYWtUaGlzLT5tX2F2QXNzZXQuZ2V0KCkgc3RhdHVzT2ZWYWx1ZUZvcktleTpAInRyYWNrcyIg ZXJyb3I6bmlsXSA9PSBBVktleVZhbHVlU3RhdHVzTG9hZGVkKSB7CiAgICAgICAgICAgICAgICAg Zm9yIChBVkFzc2V0VHJhY2sgKnRyYWNrIGluIFt3ZWFrVGhpcy0+bV9hdkFzc2V0LmdldCgpIHRy YWNrc10pIHsKLSAgICAgICAgICAgICAgICAgICAgZGlzcGF0Y2hfZ3JvdXBfZW50ZXIobWV0YWRh dGFMb2FkaW5nR3JvdXApOworICAgICAgICAgICAgICAgICAgICBkaXNwYXRjaF9ncm91cF9lbnRl cihtZXRhZGF0YUxvYWRpbmdHcm91cC5nZXQoKSk7CiAgICAgICAgICAgICAgICAgICAgIFt0cmFj ayBsb2FkVmFsdWVzQXN5bmNocm9ub3VzbHlGb3JLZXlzOmFzc2V0VHJhY2tNZXRhZGF0YUtleU5h bWVzKCkgY29tcGxldGlvbkhhbmRsZXI6XnsKLSAgICAgICAgICAgICAgICAgICAgICAgIGRpc3Bh dGNoX2dyb3VwX2xlYXZlKG1ldGFkYXRhTG9hZGluZ0dyb3VwKTsKKyAgICAgICAgICAgICAgICAg ICAgICAgIGRpc3BhdGNoX2dyb3VwX2xlYXZlKG1ldGFkYXRhTG9hZGluZ0dyb3VwLmdldCgpKTsK ICAgICAgICAgICAgICAgICAgICAgfV07CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAg fQotICAgICAgICAgICAgZGlzcGF0Y2hfZ3JvdXBfbGVhdmUobWV0YWRhdGFMb2FkaW5nR3JvdXAp OworICAgICAgICAgICAgZGlzcGF0Y2hfZ3JvdXBfbGVhdmUobWV0YWRhdGFMb2FkaW5nR3JvdXAu Z2V0KCkpOwogICAgICAgICB9KTsKICAgICB9XTsKIAotICAgIGRpc3BhdGNoX2dyb3VwX25vdGlm eShtZXRhZGF0YUxvYWRpbmdHcm91cCwgZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKKyAg ICBkaXNwYXRjaF9ncm91cF9ub3RpZnkobWV0YWRhdGFMb2FkaW5nR3JvdXAuZ2V0KCksIGRpc3Bh dGNoX2dldF9tYWluX3F1ZXVlKCksIF57CiAgICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3dlYWtU aGlzXSB7CiAgICAgICAgICAgICBpZiAod2Vha1RoaXMpCiAgICAgICAgICAgICAgICAgW3dlYWtU aGlzLT5tX29iamNPYnNlcnZlci5nZXQoKSBtZXRhZGF0YUxvYWRlZF07CiAgICAgICAgIH0pOwot Ci0gICAgICAgIGRpc3BhdGNoX3JlbGVhc2UobWV0YWRhdGFMb2FkaW5nR3JvdXApOwogICAgIH0p OwogfQogCg==