124752 2013-11-21 17:11:53 -0800 [Win] Avoid deadlock when interacting with some AVFoundationCF content 2013-11-22 09:20:56 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) PC All RESOLVED FIXED InRadar P1 Blocker --- 1 bfulgham bfulgham commit-queue eric.carlson glenn jer.noble oldest_to_newest 953359 0 bfulgham 2013-11-21 17:11:53 -0800 Testing with certain media in WebKit revealed a deadlock in the CFNotification callback code. This bug corrects this problem. 953360 1 bfulgham 2013-11-21 17:12:11 -0800 <rdar://problem/15482977> 953367 2 217634 bfulgham 2013-11-21 17:25:26 -0800 Created attachment 217634 Patch 953371 3 bfulgham 2013-11-21 17:35:49 -0800 Prevent deadlock caused by conflict over the "mapLock" mutex. Notification handling in the file, which modify assets and make other changes, are required to happen on the main thread. This patch enforces this requirement. 953571 4 217634 commit-queue 2013-11-22 09:20:54 -0800 Comment on attachment 217634 Patch Clearing flags on attachment: 217634 Committed r159691: <http://trac.webkit.org/changeset/159691> 953572 5 commit-queue 2013-11-22 09:20:56 -0800 All reviewed patches have been landed. Closing bug. 217634 2013-11-21 17:25:26 -0800 2013-11-22 09:20:54 -0800 Patch bug-124752-20131121172525.patch text/plain 4966 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1OTY1NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEzLTExLTIxICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIEF2b2lkIGRlYWRs b2NrIHdoZW4gaW50ZXJhY3Rpbmcgd2l0aCBzb21lIEFWRm91bmRhdGlvbkNGIGNvbnRlbnQKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE1NDgyOTc3PiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEyNDc1MgorCisgICAgICAgIFByZXZlbnQgZGVhZGxvY2sgY2F1 c2VkIGJ5IGNvbmZsaWN0IG92ZXIgdGhlICJtYXBMb2NrIiBtdXRleC4gTm90aWZpY2F0aW9uIGhh bmRsaW5nIGluIHRoZSBmaWxlLAorICAgICAgICB3aGljaCBtb2RpZnkgYXNzZXRzIGFuZCBtYWtl IG90aGVyIGNoYW5nZXMsIGFyZSByZXF1aXJlZCB0byBoYXBwZW4gb24gdGhlIG1haW4gdGhyZWFk LiBUaGlzCisgICAgICAgIHBhdGNoIGVuZm9yY2VzIHRoaXMgcmVxdWlyZW1lbnQuCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vY2YvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0YuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Tm90aWZpY2F0aW9uQ2FsbGJhY2tEYXRhOjpOb3RpZmljYXRp b25DYWxsYmFja0RhdGEpOiBBZGRlZAorICAgICAgICAoV2ViQ29yZTo6QVZGV3JhcHBlcjo6cHJv Y2Vzc05vdGlmaWNhdGlvbik6IE1vdmVkIGxvZ2ljIGZyb20gJ25vdGlmaWNhdGlvbkNhbGxiYWNr Jywgd2hpY2ggd2FzCisgICAgICAgIHNvbWV0aW1lcyBoYXBwZW5pbmcgb24gYSBiYWNrZ3JvdW5k IHRocmVhZC4KKyAgICAgICAgKFdlYkNvcmU6OkFWRldyYXBwZXI6Om5vdGlmaWNhdGlvbkNhbGxi YWNrKTogRGlzcGF0Y2ggY2FsbHMgdG8gbWFpbiB0aHJlYWQuCisKIDIwMTMtMTEtMjEgIERhbmll bCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIEJ1aWxkIGZpeDsg ZXhwb3J0IHN5bWJvbCBmb3IgV2ViQ29yZTo6cHJvdmlkZURldmljZU9yaWVudGF0aW9uVG8oKQpJ bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL2NmL01l ZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNGLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vY2YvTWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uQ0YuY3BwCShyZXZpc2lvbiAxNTk2MzcpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vY2YvTWVkaWFQbGF5ZXJQcml2YXRlQVZG b3VuZGF0aW9uQ0YuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjIsNiArMTIyLDcgQEAgcHVibGlj OgogICAgIHN0YXRpYyB2b2lkIHBlcmlvZGljVGltZU9ic2VydmVyQ2FsbGJhY2soQVZDRlBsYXll clJlZiwgQ01UaW1lLCB2b2lkKik7CiAgICAgc3RhdGljIHZvaWQgc2Vla0NvbXBsZXRlZENhbGxi YWNrKEFWQ0ZQbGF5ZXJJdGVtUmVmLCBCb29sZWFuLCB2b2lkKik7CiAgICAgc3RhdGljIHZvaWQg bm90aWZpY2F0aW9uQ2FsbGJhY2soQ0ZOb3RpZmljYXRpb25DZW50ZXJSZWYsIHZvaWQqLCBDRlN0 cmluZ1JlZiwgY29uc3Qgdm9pZCosIENGRGljdGlvbmFyeVJlZik7CisgICAgc3RhdGljIHZvaWQg cHJvY2Vzc05vdGlmaWNhdGlvbih2b2lkKiBjb250ZXh0KTsKIAogICAgIGlubGluZSBBVkNGUGxh eWVyTGF5ZXJSZWYgdmlkZW9MYXllcigpIGNvbnN0IHsgcmV0dXJuIChBVkNGUGxheWVyTGF5ZXJS ZWYpbV9hdkNGVmlkZW9MYXllci5nZXQoKTsgfQogICAgIGlubGluZSBBVkNGUGxheWVyUmVmIGF2 UGxheWVyKCkgY29uc3QgeyByZXR1cm4gKEFWQ0ZQbGF5ZXJSZWYpbV9hdlBsYXllci5nZXQoKTsg fQpAQCAtMTQxMCwyMSArMTQxMSwzNCBAQCB2b2lkIEFWRldyYXBwZXI6OnBlcmlvZGljVGltZU9i c2VydmVyQ2FsCiAgICAgc2VsZi0+bV9vd25lci0+c2NoZWR1bGVNYWluVGhyZWFkTm90aWZpY2F0 aW9uKE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6Tm90aWZpY2F0aW9uOjpQbGF5ZXJU aW1lQ2hhbmdlZCwgdGltZSk7CiB9CiAKLXZvaWQgQVZGV3JhcHBlcjo6bm90aWZpY2F0aW9uQ2Fs bGJhY2soQ0ZOb3RpZmljYXRpb25DZW50ZXJSZWYsIHZvaWQqIG9ic2VydmVyLCBDRlN0cmluZ1Jl ZiBwcm9wZXJ0eU5hbWUsIGNvbnN0IHZvaWQqIG9iamVjdCwgQ0ZEaWN0aW9uYXJ5UmVmKQorc3Ry dWN0IE5vdGlmaWNhdGlvbkNhbGxiYWNrRGF0YSB7CisgICAgUmV0YWluUHRyPENGU3RyaW5nUmVm PiBtX3Byb3BlcnR5TmFtZTsKKyAgICB2b2lkKiBtX2NvbnRleHQ7CisKKyAgICBOb3RpZmljYXRp b25DYWxsYmFja0RhdGEoQ0ZTdHJpbmdSZWYgcHJvcGVydHlOYW1lLCB2b2lkKiBjb250ZXh0KQor ICAgICAgICA6IG1fcHJvcGVydHlOYW1lKHByb3BlcnR5TmFtZSksIG1fY29udGV4dChjb250ZXh0 KQorICAgIHsKKyAgICB9Cit9OworCit2b2lkIEFWRldyYXBwZXI6OnByb2Nlc3NOb3RpZmljYXRp b24odm9pZCogY29udGV4dCkKIHsKKyAgICBBU1NFUlQoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUo KSA9PSBkaXNwYXRjaF9nZXRfY3VycmVudF9xdWV1ZSgpKTsKKyAgICBBU1NFUlQoY29udGV4dCk7 CisKKyAgICBpZiAoIWNvbnRleHQpCisgICAgICAgIHJldHVybjsKKworICAgIE93blB0cjxOb3Rp ZmljYXRpb25DYWxsYmFja0RhdGE+IG5vdGlmaWNhdGlvbkRhdGEgPSBhZG9wdFB0cihyZWludGVy cHJldF9jYXN0PE5vdGlmaWNhdGlvbkNhbGxiYWNrRGF0YSo+KGNvbnRleHQpKTsKKwogICAgIE11 dGV4TG9ja2VyIGxvY2tlcihtYXBMb2NrKCkpOwotICAgIEFWRldyYXBwZXIqIHNlbGYgPSBhdmZX cmFwcGVyRm9yQ2FsbGJhY2tDb250ZXh0KG9ic2VydmVyKTsKLSAgICAKKyAgICBBVkZXcmFwcGVy KiBzZWxmID0gYXZmV3JhcHBlckZvckNhbGxiYWNrQ29udGV4dChub3RpZmljYXRpb25EYXRhLT5t X2NvbnRleHQpOwogICAgIGlmICghc2VsZikgewotICAgICAgICBMT0coTWVkaWEsICJBVkZXcmFw cGVyOjpub3RpZmljYXRpb25DYWxsYmFjayBpbnZva2VkIGZvciBkZWxldGVkIEFWRldyYXBwZXIg JWQiLCByZWludGVycHJldF9jYXN0PHVpbnRwdHJfdD4ob2JzZXJ2ZXIpKTsKKyAgICAgICAgTE9H KE1lZGlhLCAiQVZGV3JhcHBlcjo6cHJvY2Vzc05vdGlmaWNhdGlvbiBpbnZva2VkIGZvciBkZWxl dGVkIEFWRldyYXBwZXIgJWQiLCByZWludGVycHJldF9jYXN0PHVpbnRwdHJfdD4oY29udGV4dCkp OwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0jaWYgIUxPR19ESVNBQkxFRAotICAgIGNoYXIg bm90aWZpY2F0aW9uTmFtZVsyNTZdOwotICAgIENGU3RyaW5nR2V0Q1N0cmluZyhwcm9wZXJ0eU5h bWUsIG5vdGlmaWNhdGlvbk5hbWUsIHNpemVvZihub3RpZmljYXRpb25OYW1lKSwga0NGU3RyaW5n RW5jb2RpbmdBU0NJSSk7Ci0gICAgTE9HKE1lZGlhLCAiQVZGV3JhcHBlcjo6bm90aWZpY2F0aW9u Q2FsbGJhY2soJXApICVzIiwgc2VsZiwgbm90aWZpY2F0aW9uTmFtZSk7Ci0jZW5kaWYKKyAgICBD RlN0cmluZ1JlZiBwcm9wZXJ0eU5hbWUgPSBub3RpZmljYXRpb25EYXRhLT5tX3Byb3BlcnR5TmFt ZS5nZXQoKTsKIAogICAgIGlmIChDRkVxdWFsKHByb3BlcnR5TmFtZSwgQVZDRlBsYXllckl0ZW1E aWRQbGF5VG9FbmRUaW1lTm90aWZpY2F0aW9uKSkKICAgICAgICAgc2VsZi0+bV9vd25lci0+c2No ZWR1bGVNYWluVGhyZWFkTm90aWZpY2F0aW9uKE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlv bjo6Tm90aWZpY2F0aW9uOjpJdGVtRGlkUGxheVRvRW5kVGltZSk7CkBAIC0xNDU1LDYgKzE0Njks MTkgQEAgdm9pZCBBVkZXcmFwcGVyOjpub3RpZmljYXRpb25DYWxsYmFjayhDRgogICAgICAgICBB U1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAordm9pZCBBVkZXcmFwcGVyOjpub3RpZmljYXRpb25D YWxsYmFjayhDRk5vdGlmaWNhdGlvbkNlbnRlclJlZiwgdm9pZCogb2JzZXJ2ZXIsIENGU3RyaW5n UmVmIHByb3BlcnR5TmFtZSwgY29uc3Qgdm9pZCogb2JqZWN0LCBDRkRpY3Rpb25hcnlSZWYpCit7 CisjaWYgIUxPR19ESVNBQkxFRAorICAgIGNoYXIgbm90aWZpY2F0aW9uTmFtZVsyNTZdOworICAg IENGU3RyaW5nR2V0Q1N0cmluZyhwcm9wZXJ0eU5hbWUsIG5vdGlmaWNhdGlvbk5hbWUsIHNpemVv Zihub3RpZmljYXRpb25OYW1lKSwga0NGU3RyaW5nRW5jb2RpbmdBU0NJSSk7CisgICAgTE9HKE1l ZGlhLCAiQVZGV3JhcHBlcjo6bm90aWZpY2F0aW9uQ2FsbGJhY2soaWY9JWQpICVzIiwgcmVpbnRl cnByZXRfY2FzdDx1aW50cHRyX3Q+KG9ic2VydmVyKSwgbm90aWZpY2F0aW9uTmFtZSk7CisjZW5k aWYKKworICAgIE93blB0cjxOb3RpZmljYXRpb25DYWxsYmFja0RhdGE+IG5vdGlmaWNhdGlvbkRh dGEgPSBhZG9wdFB0cihuZXcgTm90aWZpY2F0aW9uQ2FsbGJhY2tEYXRhKHByb3BlcnR5TmFtZSwg b2JzZXJ2ZXIpKTsKKworICAgIGRpc3BhdGNoX2FzeW5jX2YoZGlzcGF0Y2hfZ2V0X21haW5fcXVl dWUoKSwgbm90aWZpY2F0aW9uRGF0YS5sZWFrUHRyKCksIHByb2Nlc3NOb3RpZmljYXRpb24pOwor fQorCiB2b2lkIEFWRldyYXBwZXI6OmxvYWRQbGF5YWJsZUNvbXBsZXRpb25DYWxsYmFjayhBVkNG QXNzZXRSZWYsIHZvaWQqIGNvbnRleHQpCiB7CiAgICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1hcExv Y2soKSk7Cg==