141081 2015-01-30 05:48:04 -0800 OSObjectPtr does not work with dispatch_data_t on Maverics 2015-01-31 12:43:55 -0800 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 141117 141022 1 koivisto webkit-unassigned commit-queue sam oldest_to_newest 1065551 0 koivisto 2015-01-30 05:48:04 -0800 2015-01-30 15:43:57.680 com.apple.WebKit.Networking.Development[57008:1c07] -[OS_dispatch_data _xref_dispose]: unrecognized selector sent to instance 0x7f899fa021d0 1065560 1 245717 koivisto 2015-01-30 06:04:56 -0800 Created attachment 245717 patch 1065617 2 koivisto 2015-01-30 12:46:30 -0800 https://trac.webkit.org/r179408 1065819 3 commit-queue 2015-01-31 09:39:36 -0800 Re-opened since this is blocked by bug 141117 1065823 4 koivisto 2015-01-31 09:44:51 -0800 Though this worked locally it doesn't seem to work on bots. This might be because the definition of dispatch_data_t varies based on context (objc or not etc) and so the template matching is not consistent. 1065844 5 245790 koivisto 2015-01-31 11:50:58 -0800 Created attachment 245790 use DispatchPtr instead Enabling the cache so bots see the change. That will land separately. 1065856 6 koivisto 2015-01-31 12:43:55 -0800 https://trac.webkit.org/r179446 245717 2015-01-30 06:04:56 -0800 2015-01-31 11:50:58 -0800 patch osobject-dispatchdata.patch text/plain 3146 koivisto SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxNzkzOTgpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE1LTAxLTMwICBBbnR0aSBLb2l2aXN0byAgPGFu dHRpQGFwcGxlLmNvbT4KKworICAgICAgICBPU09iamVjdFB0ciBkb2VzIG5vdCB3b3JrIHdpdGgg ZGlzcGF0Y2hfZGF0YV90IG9uIE1hdmVyaWNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDEwODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFRyeWluZyB0byB1c2UgT1NPYmplY3RQdHI8ZGlz cGF0Y2hfZGF0YV90PiB0aHJvd3MgCisgICAgICAgIAorICAgICAgICAtW09TX2Rpc3BhdGNoX2Rh dGEgX3hyZWZfZGlzcG9zZV06IHVucmVjb2duaXplZCBzZWxlY3RvciBzZW50IHRvIGluc3RhbmNl IDAKKworICAgICAgICAqIHd0Zi9PU09iamVjdFB0ci5oOgorICAgICAgICAoV1RGOjpyZXRhaW5P U09iamVjdDxkaXNwYXRjaF9kYXRhX3Q+KToKKyAgICAgICAgKFdURjo6cmVsZWFzZU9TT2JqZWN0 PGRpc3BhdGNoX2RhdGFfdD4pOgorICAgICAgICAKKyAgICAgICAgICAgIEFkZCBzcGVjaWFsaXph dGlvbiBmb3IgZGlzcGF0Y2hfZGF0YV90IG9uIE1hdmVyaWNzLgorCiAyMDE1LTAxLTI5ICBTYW50 b3NoIE1haHRvICA8c2FudG9zaGJpdDIwMDdAZ21haWwuY29tPgogCiAgICAgICAgIFJlZmFjdG9y IFN0cmluZzo6Zm9ybWF0IHRvIGhhbmRsZSB1bnJlYWNoZWQgdmFfZW5kLgpJbmRleDogU291cmNl L1dURi93dGYvT1NPYmplY3RQdHIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9PU09i amVjdFB0ci5oCShyZXZpc2lvbiAxNzkzOTcpCisrKyBTb3VyY2UvV1RGL3d0Zi9PU09iamVjdFB0 ci5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw2ICszMiw3IEBACiAKICNpZiBQTEFURk9STShNQUMp ICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPCAxMDEwMDAKIAorI2luY2x1ZGUg PGRpc3BhdGNoL2Rpc3BhdGNoLmg+CiAjaWYgX19oYXNfaW5jbHVkZSg8b3Mvb2JqZWN0X3ByaXZh dGUuaD4pCiAjaW5jbHVkZSA8b3Mvb2JqZWN0X3ByaXZhdGUuaD4KICNlbmRpZgpAQCAtODIsNiAr ODMsMTggQEAgc3RhdGljIGlubGluZSB2b2lkIHJlbGVhc2VPU09iamVjdChUIHB0cgogI2VuZGlm CiB9CiAKKyNpZiBQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlS RUQgPCAxMDEwMDAKK3RlbXBsYXRlPD4gaW5saW5lIHZvaWQgcmV0YWluT1NPYmplY3Q8ZGlzcGF0 Y2hfZGF0YV90PihkaXNwYXRjaF9kYXRhX3QgcHRyKQoreworICAgIGRpc3BhdGNoX3JldGFpbihw dHIpOworfQorCit0ZW1wbGF0ZTw+IGlubGluZSB2b2lkIHJlbGVhc2VPU09iamVjdDxkaXNwYXRj aF9kYXRhX3Q+KGRpc3BhdGNoX2RhdGFfdCBwdHIpCit7CisgICAgZGlzcGF0Y2hfcmVsZWFzZShw dHIpOworfQorI2VuZGlmCisKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGNsYXNzIE9TT2JqZWN0UHRy IHsKIHB1YmxpYzoKICAgICBPU09iamVjdFB0cigpCkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNzkzOTgpCisrKyBUb29scy9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxNS0wMS0zMCAgQW50 dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CisKKyAgICAgICAgT1NPYmplY3RQdHIgZG9l cyBub3Qgd29yayB3aXRoIGRpc3BhdGNoX2RhdGFfdCBvbiBNYXZlcmljcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxMDgxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3Rz L1dURi9kYXJ3aW4vT1NPYmplY3RQdHIuY3BwOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVT VCk6CisKIDIwMTUtMDEtMjkgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAK ICAgICAgICAgQnVpbHQgcmVzdWx0IHRha2VzIHRvbyBsb25nIHRvIGJlIGNvbXByZXNzZWQgb24g Ym90cwpJbmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvZGFyd2luL09TT2JqZWN0 UHRyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9kYXJ3 aW4vT1NPYmplY3RQdHIuY3BwCShyZXZpc2lvbiAxNzkzOTcpCisrKyBUb29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dURi9kYXJ3aW4vT1NPYmplY3RQdHIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02 Myw0ICs2MywxNiBAQCBURVNUKE9TT2JqZWN0UHRyLCBMZWFrUmVmKQogICAgIFdURjo6cmVsZWFz ZU9TT2JqZWN0KHF1ZXVlKTsKIH0KIAorVEVTVChPU09iamVjdFB0ciwgRGlzcGF0Y2hEYXRhKQor eworICAgIHVpbnQ4X3QgYnVmZmVyWzEwMjRdOworICAgIE9TT2JqZWN0UHRyPGRpc3BhdGNoX2Rh dGFfdD4gZm9vID0gYWRvcHRPU09iamVjdChkaXNwYXRjaF9kYXRhX2NyZWF0ZShidWZmZXIsIDEw MjQsIG51bGxwdHIsIERJU1BBVENIX0RBVEFfREVTVFJVQ1RPUl9ERUZBVUxUKSk7CisgICAgRVhQ RUNUX0VRKDEsIENGR2V0UmV0YWluQ291bnQoZm9vLmdldCgpKSk7CisgICAgeworICAgICAgICBP U09iamVjdFB0cjxkaXNwYXRjaF9kYXRhX3Q+IGZvbzIgPSBmb287CisgICAgICAgIEVYUEVDVF9F USgyLCBDRkdldFJldGFpbkNvdW50KGZvby5nZXQoKSkpOworICAgIH0KKyAgICBFWFBFQ1RfRVEo MSwgQ0ZHZXRSZXRhaW5Db3VudChmb28uZ2V0KCkpKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgVGVz dFdlYktpdEFQSQo= 245790 2015-01-31 11:50:58 -0800 2015-01-31 12:39:26 -0800 use DispatchPtr instead dispatch-ptr.patch text/plain 11383 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3OTQ0MSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE1LTAxLTMxICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBPU09iamVjdFB0ciBkb2VzIG5v dCB3b3JrIHdpdGggZGlzcGF0Y2hfZGF0YV90IG9uIE1hdmVyaWNzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDEwODEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcmV2aW91cyBhdHRlbXB0IHRvIHNwZWNp YWwgY2FzZSBkaXNwYXRjaF9kYXRhX3QgaW4gT1NPYmplY3RQdHIgZGlkbid0IHdvcmsgaW4gYWxs IGNhc2VzCisgICAgICAgIHByb2JhYmx5IGR1ZSB0byB0aGUgY29udGV4dCBzZW5zaXRpdml0eSBv ZiB0aGUgZGVmaW5pdGlvbiBvZiB0aGUgZGlzcGF0Y2hfZGF0YV90IHR5cGUuCisKKyAgICAgICAg Rm9yIG5vdywgYWRkIERpc3BhdGNoUHRyIGZvciB0aGUgY2FjaGUgY29kZSBhbmQgdXNlIGl0Lgor CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZS5oOgor ICAgICAgICAoV2ViS2l0OjpEaXNwYXRjaFB0cjo6RGlzcGF0Y2hQdHIpOgorICAgICAgICAoV2Vi S2l0OjpEaXNwYXRjaFB0cjo6fkRpc3BhdGNoUHRyKToKKyAgICAgICAgKFdlYktpdDo6RGlzcGF0 Y2hQdHI6Om9wZXJhdG9yPSk6CisgICAgICAgIChXZWJLaXQ6OkRpc3BhdGNoUHRyOjpnZXQpOgor ICAgICAgICAoV2ViS2l0OjpEaXNwYXRjaFB0cjo6b3BlcmF0b3IgYm9vbCk6CisgICAgICAgIChX ZWJLaXQ6OmFkb3B0RGlzcGF0Y2gpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05l dHdvcmtDYWNoZVN0b3JhZ2VDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hl U3RvcmFnZTo6RGF0YTo6RGF0YSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZVN0b3Jh Z2U6OkRhdGE6OmRhdGEpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGVTdG9yYWdlOjpO ZXR3b3JrQ2FjaGVTdG9yYWdlKToKKyAgICAgICAgKFdlYktpdDo6Y3JlYXRlSU9DaGFubmVsRm9y S2V5KToKKyAgICAgICAgKFdlYktpdDo6ZGVjb2RlRW50cnkpOgorICAgICAgICAoV2ViS2l0Ojpl bmNvZGVFbnRyeU1ldGFEYXRhKToKKyAgICAgICAgKFdlYktpdDo6ZW5jb2RlRW50cnkpOgorCiAy MDE1LTAxLTMwICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAg ICAgIEFkZCBhbmQgaG9vayB1cCBBUElOYXZpZ2F0aW9uQ2xpZW50CkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9jb25maWcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9jb25maWcuaAkocmV2 aXNpb24gMTc4OTM5KQorKysgU291cmNlL1dlYktpdDIvY29uZmlnLmgJKHdvcmtpbmcgY29weSkK QEAgLTgyLDcgKzgyLDcgQEAKICNlbmRpZgogCiAjaWZuZGVmIEVOQUJMRV9ORVRXT1JLX0NBQ0hF Ci0jaWYgKFBMQVRGT1JNKE1BQykgfHwgUExBVEZPUk0oR1RLKSkgJiYgRU5BQkxFKE5FVFdPUktf UFJPQ0VTUykKLSNkZWZpbmUgRU5BQkxFX05FVFdPUktfQ0FDSEUgMAorI2lmIFBMQVRGT1JNKE1B QykgJiYgRU5BQkxFKE5FVFdPUktfUFJPQ0VTUykKKyNkZWZpbmUgRU5BQkxFX05FVFdPUktfQ0FD SEUgMQogI2VuZGlmCiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNz L2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmgJKHJldmlzaW9uIDE3 OTA1MikKKysrIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNo ZVN0b3JhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtMzQsMTAgKzM0LDYgQEAKICNpbmNsdWRlIDx3 dGYvRGVxdWUuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAotI2lmIFBMQVRG T1JNKENPQ09BKQotI2luY2x1ZGUgPHd0Zi9PU09iamVjdFB0ci5oPgotI2VuZGlmCi0KIG5hbWVz cGFjZSBXZWJDb3JlIHsKIGNsYXNzIFNoYXJlZEJ1ZmZlcjsKIH0KQEAgLTUxLDYgKzQ3LDU3IEBA IG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBTaGFyZWFibGVSZXNvdXJjZTsKIAorI2lmIFBM QVRGT1JNKENPQ09BKQordGVtcGxhdGUgPHR5cGVuYW1lIFQ+IGNsYXNzIERpc3BhdGNoUHRyOwor dGVtcGxhdGUgPHR5cGVuYW1lIFQ+IERpc3BhdGNoUHRyPFQ+IGFkb3B0RGlzcGF0Y2goVCBkaXNw YXRjaE9iamVjdCk7CisKKy8vIEZJWE1FOiBVc2UgT1NPYmplY3RQdHIgaW5zdGVhZCB3aGVuIGl0 IHdvcmtzIHdpdGggZGlzcGF0Y2hfZGF0YV90IG9uIGFsbCBwbGF0Zm9ybXMuCit0ZW1wbGF0ZTx0 eXBlbmFtZSBUPiBjbGFzcyBEaXNwYXRjaFB0ciB7CitwdWJsaWM6CisgICAgRGlzcGF0Y2hQdHIo KQorICAgICAgICA6IG1fcHRyKG51bGxwdHIpCisgICAgeworICAgIH0KKyAgICBEaXNwYXRjaFB0 cihjb25zdCBEaXNwYXRjaFB0ciYgb3RoZXIpCisgICAgICAgIDogbV9wdHIob3RoZXIubV9wdHIp CisgICAgeworICAgICAgICBpZiAobV9wdHIpCisgICAgICAgICAgICBkaXNwYXRjaF9yZXRhaW4o bV9wdHIpOworICAgIH0KKyAgICB+RGlzcGF0Y2hQdHIoKQorICAgIHsKKyAgICAgICAgaWYgKG1f cHRyKQorICAgICAgICAgICAgZGlzcGF0Y2hfcmVsZWFzZShtX3B0cik7CisgICAgfQorCisgICAg RGlzcGF0Y2hQdHImIG9wZXJhdG9yPShjb25zdCBEaXNwYXRjaFB0ciYgb3RoZXIpCisgICAgewor ICAgICAgICBhdXRvIGNvcHkgPSBvdGhlcjsKKyAgICAgICAgc3RkOjpzd2FwKG1fcHRyLCBjb3B5 Lm1fcHRyKTsKKyAgICAgICAgcmV0dXJuICp0aGlzOworICAgIH0KKworICAgIFQgZ2V0KCkgY29u c3QgeyByZXR1cm4gbV9wdHI7IH0KKyAgICBleHBsaWNpdCBvcGVyYXRvciBib29sKCkgY29uc3Qg eyByZXR1cm4gbV9wdHI7IH0KKworICAgIGZyaWVuZCBEaXNwYXRjaFB0ciBhZG9wdERpc3BhdGNo PFQ+KFQpOworCitwcml2YXRlOgorICAgIHN0cnVjdCBBZG9wdCB7IH07CisgICAgRGlzcGF0Y2hQ dHIoQWRvcHQsIFQgZGF0YSkKKyAgICAgICAgOiBtX3B0cihkYXRhKQorICAgIHsKKyAgICB9CisK KyAgICBUIG1fcHRyOworfTsKKwordGVtcGxhdGUgPHR5cGVuYW1lIFQ+IERpc3BhdGNoUHRyPFQ+ IGFkb3B0RGlzcGF0Y2goVCBkaXNwYXRjaE9iamVjdCkKK3sKKyAgICByZXR1cm4gRGlzcGF0Y2hQ dHI8VD4odHlwZW5hbWUgRGlzcGF0Y2hQdHI8VD46OkFkb3B0IHsgfSwgZGlzcGF0Y2hPYmplY3Qp OworfQorI2VuZGlmCisKIGNsYXNzIE5ldHdvcmtDYWNoZVN0b3JhZ2UgewogICAgIFdURl9NQUtF X05PTkNPUFlBQkxFKE5ldHdvcmtDYWNoZVN0b3JhZ2UpOwogcHVibGljOgpAQCAtNjEsNyArMTA4 LDcgQEAgcHVibGljOgogICAgICAgICBEYXRhKCk7CiAgICAgICAgIERhdGEoY29uc3QgdWludDhf dCosIHNpemVfdCk7CiAjaWYgUExBVEZPUk0oQ09DT0EpCi0gICAgICAgIGV4cGxpY2l0IERhdGEo T1NPYmplY3RQdHI8ZGlzcGF0Y2hfZGF0YV90Pik7CisgICAgICAgIGV4cGxpY2l0IERhdGEoRGlz cGF0Y2hQdHI8ZGlzcGF0Y2hfZGF0YV90Pik7CiAjZW5kaWYKICAgICAgICAgYm9vbCBpc051bGwo KSBjb25zdDsKIApAQCAtNzMsNyArMTIwLDcgQEAgcHVibGljOgogI2VuZGlmCiAgICAgcHJpdmF0 ZToKICNpZiBQTEFURk9STShDT0NPQSkKLSAgICAgICAgbXV0YWJsZSBPU09iamVjdFB0cjxkaXNw YXRjaF9kYXRhX3Q+IG1fZGlzcGF0Y2hEYXRhOworICAgICAgICBtdXRhYmxlIERpc3BhdGNoUHRy PGRpc3BhdGNoX2RhdGFfdD4gbV9kaXNwYXRjaERhdGE7CiAjZW5kaWYKICAgICAgICAgbXV0YWJs ZSBjb25zdCB1aW50OF90KiBtX2RhdGE7CiAgICAgICAgIHNpemVfdCBtX3NpemU7CkBAIC0xMjAs OCArMTY3LDggQEAgcHJpdmF0ZToKICAgICB1bnNpZ25lZCBtX2FjdGl2ZVJldHJpZXZlT3BlcmF0 aW9uQ291bnQgeyAwIH07CiAKICNpZiBQTEFURk9STShDT0NPQSkKLSAgICBtdXRhYmxlIE9TT2Jq ZWN0UHRyPGRpc3BhdGNoX3F1ZXVlX3Q+IG1faW9RdWV1ZTsKLSAgICBtdXRhYmxlIE9TT2JqZWN0 UHRyPGRpc3BhdGNoX3F1ZXVlX3Q+IG1fYmFja2dyb3VuZElPUXVldWU7CisgICAgbXV0YWJsZSBE aXNwYXRjaFB0cjxkaXNwYXRjaF9xdWV1ZV90PiBtX2lvUXVldWU7CisgICAgbXV0YWJsZSBEaXNw YXRjaFB0cjxkaXNwYXRjaF9xdWV1ZV90PiBtX2JhY2tncm91bmRJT1F1ZXVlOwogI2VuZGlmCiB9 OwogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2Fj aGVTdG9yYWdlQ29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvTmV0d29ya1By b2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZUNvY29hLm1tCShyZXZpc2lvbiAxNzkzMjcp CisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9y YWdlQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTgwLDE2ICs4MCwxNiBAQCBOZXR3b3JrQ2Fj aGVTdG9yYWdlOjpEYXRhOjpEYXRhKCkKIH0KIAogTmV0d29ya0NhY2hlU3RvcmFnZTo6RGF0YTo6 RGF0YShjb25zdCB1aW50OF90KiBkYXRhLCBzaXplX3Qgc2l6ZSkKLSAgICA6IG1fZGlzcGF0Y2hE YXRhKGFkb3B0T1NPYmplY3QoZGlzcGF0Y2hfZGF0YV9jcmVhdGUoZGF0YSwgc2l6ZSwgbnVsbHB0 ciwgRElTUEFUQ0hfREFUQV9ERVNUUlVDVE9SX0RFRkFVTFQpKSkKKyAgICA6IG1fZGlzcGF0Y2hE YXRhKGFkb3B0RGlzcGF0Y2goZGlzcGF0Y2hfZGF0YV9jcmVhdGUoZGF0YSwgc2l6ZSwgbnVsbHB0 ciwgRElTUEFUQ0hfREFUQV9ERVNUUlVDVE9SX0RFRkFVTFQpKSkKICAgICAsIG1fZGF0YShudWxs cHRyKQogICAgICwgbV9zaXplKHNpemUpCiB7CiB9CiAKLU5ldHdvcmtDYWNoZVN0b3JhZ2U6OkRh dGE6OkRhdGEoT1NPYmplY3RQdHI8ZGlzcGF0Y2hfZGF0YV90PiBkaXNwYXRjaERhdGEpCitOZXR3 b3JrQ2FjaGVTdG9yYWdlOjpEYXRhOjpEYXRhKERpc3BhdGNoUHRyPGRpc3BhdGNoX2RhdGFfdD4g ZGlzcGF0Y2hEYXRhKQogewogICAgIGNvbnN0IHZvaWQqIGRhdGE7Ci0gICAgbV9kaXNwYXRjaERh dGEgPSBhZG9wdE9TT2JqZWN0KGRpc3BhdGNoX2RhdGFfY3JlYXRlX21hcChkaXNwYXRjaERhdGEu Z2V0KCksICZkYXRhLCAmbV9zaXplKSk7CisgICAgbV9kaXNwYXRjaERhdGEgPSBhZG9wdERpc3Bh dGNoKGRpc3BhdGNoX2RhdGFfY3JlYXRlX21hcChkaXNwYXRjaERhdGEuZ2V0KCksICZkYXRhLCAm bV9zaXplKSk7CiAgICAgbV9kYXRhID0gc3RhdGljX2Nhc3Q8Y29uc3QgdWludDhfdCo+KGRhdGEp OwogfQogCkBAIC05OCw3ICs5OCw3IEBAIGNvbnN0IHVpbnQ4X3QqIE5ldHdvcmtDYWNoZVN0b3Jh Z2U6OkRhdGEKICAgICBpZiAoIW1fZGF0YSkgewogICAgICAgICBjb25zdCB2b2lkKiBkYXRhOwog ICAgICAgICBzaXplX3Qgc2l6ZTsKLSAgICAgICAgbV9kaXNwYXRjaERhdGEgPSBhZG9wdE9TT2Jq ZWN0KGRpc3BhdGNoX2RhdGFfY3JlYXRlX21hcChtX2Rpc3BhdGNoRGF0YS5nZXQoKSwgJmRhdGEs ICZzaXplKSk7CisgICAgICAgIG1fZGlzcGF0Y2hEYXRhID0gYWRvcHREaXNwYXRjaChkaXNwYXRj aF9kYXRhX2NyZWF0ZV9tYXAobV9kaXNwYXRjaERhdGEuZ2V0KCksICZkYXRhLCAmc2l6ZSkpOwog ICAgICAgICBBU1NFUlQoc2l6ZSA9PSBtX3NpemUpOwogICAgICAgICBtX2RhdGEgPSBzdGF0aWNf Y2FzdDxjb25zdCB1aW50OF90Kj4oZGF0YSk7CiAgICAgfQpAQCAtMTIyLDggKzEyMiw4IEBAIHN0 ZDo6dW5pcXVlX3B0cjxOZXR3b3JrQ2FjaGVTdG9yYWdlPiBOZXQKIAogTmV0d29ya0NhY2hlU3Rv cmFnZTo6TmV0d29ya0NhY2hlU3RvcmFnZShjb25zdCBTdHJpbmcmIGRpcmVjdG9yeVBhdGgpCiAg ICAgOiBtX2RpcmVjdG9yeVBhdGgoZGlyZWN0b3J5UGF0aCkKLSAgICAsIG1faW9RdWV1ZShhZG9w dE9TT2JqZWN0KGRpc3BhdGNoX3F1ZXVlX2NyZWF0ZSgiY29tLmFwcGxlLldlYktpdC5DYWNoZS5T dG9yYWdlIiwgRElTUEFUQ0hfUVVFVUVfQ09OQ1VSUkVOVCkpKQotICAgICwgbV9iYWNrZ3JvdW5k SU9RdWV1ZShhZG9wdE9TT2JqZWN0KGRpc3BhdGNoX3F1ZXVlX2NyZWF0ZSgiY29tLmFwcGxlLldl YktpdC5DYWNoZS5TdG9yYWdlLkJhY2tncm91bmQiLCBESVNQQVRDSF9RVUVVRV9DT05DVVJSRU5U KSkpCisgICAgLCBtX2lvUXVldWUoYWRvcHREaXNwYXRjaChkaXNwYXRjaF9xdWV1ZV9jcmVhdGUo ImNvbS5hcHBsZS5XZWJLaXQuQ2FjaGUuU3RvcmFnZSIsIERJU1BBVENIX1FVRVVFX0NPTkNVUlJF TlQpKSkKKyAgICAsIG1fYmFja2dyb3VuZElPUXVldWUoYWRvcHREaXNwYXRjaChkaXNwYXRjaF9x dWV1ZV9jcmVhdGUoImNvbS5hcHBsZS5XZWJLaXQuQ2FjaGUuU3RvcmFnZS5CYWNrZ3JvdW5kIiwg RElTUEFUQ0hfUVVFVUVfQ09OQ1VSUkVOVCkpKQogewogICAgIGRpc3BhdGNoX3NldF90YXJnZXRf cXVldWUobV9iYWNrZ3JvdW5kSU9RdWV1ZS5nZXQoKSwgZGlzcGF0Y2hfZ2V0X2dsb2JhbF9xdWV1 ZShESVNQQVRDSF9RVUVVRV9QUklPUklUWV9CQUNLR1JPVU5ELCAwKSk7CiAKQEAgLTE2Miw3ICsx NjIsNyBAQCBzdGF0aWMgU3RyaW5nIGZpbGVQYXRoRm9yS2V5KGNvbnN0IE5ldHdvCiB9CiAKIGVu dW0gY2xhc3MgSU9DaGFubmVsVHlwZSB7IFJlYWQsIFdyaXRlIH07Ci1zdGF0aWMgT1NPYmplY3RQ dHI8ZGlzcGF0Y2hfaW9fdD4gY3JlYXRlSU9DaGFubmVsRm9yS2V5KGNvbnN0IE5ldHdvcmtDYWNo ZUtleSYga2V5LCBJT0NoYW5uZWxUeXBlIHR5cGUsIGNvbnN0IFN0cmluZyYgY2FjaGVQYXRoLCBp bnQmIGZkKQorc3RhdGljIERpc3BhdGNoUHRyPGRpc3BhdGNoX2lvX3Q+IGNyZWF0ZUlPQ2hhbm5l bEZvcktleShjb25zdCBOZXR3b3JrQ2FjaGVLZXkmIGtleSwgSU9DaGFubmVsVHlwZSB0eXBlLCBj b25zdCBTdHJpbmcmIGNhY2hlUGF0aCwgaW50JiBmZCkKIHsKICAgICBpbnQgb2ZsYWc7CiAgICAg bW9kZV90IG1vZGU7CkBAIC0xODMsNyArMTgzLDcgQEAgc3RhdGljIE9TT2JqZWN0UHRyPGRpc3Bh dGNoX2lvX3Q+IGNyZWF0ZQogCiAgICAgTE9HKE5ldHdvcmtDYWNoZVN0b3JhZ2UsICIoTmV0d29y a1Byb2Nlc3MpIG9wZW5pbmcgJXMgdHlwZT0lZCIsIHBhdGguZGF0YSgpLCB0eXBlKTsKIAotICAg IE9TT2JqZWN0UHRyPGRpc3BhdGNoX2lvX3Q+IGNoYW5uZWwgPSBhZG9wdE9TT2JqZWN0KGRpc3Bh dGNoX2lvX2NyZWF0ZShESVNQQVRDSF9JT19SQU5ET00sIGZkLCBkaXNwYXRjaF9nZXRfbWFpbl9x dWV1ZSgpLCBbZmQsIHR5cGVdKGludCBlcnJvcikgeworICAgIGF1dG8gY2hhbm5lbCA9IGFkb3B0 RGlzcGF0Y2goZGlzcGF0Y2hfaW9fY3JlYXRlKERJU1BBVENIX0lPX1JBTkRPTSwgZmQsIGRpc3Bh dGNoX2dldF9tYWluX3F1ZXVlKCksIFtmZCwgdHlwZV0oaW50IGVycm9yKSB7CiAgICAgICAgIGNs b3NlKGZkKTsKICAgICAgICAgaWYgKGVycm9yKQogICAgICAgICAgICAgTE9HKE5ldHdvcmtDYWNo ZVN0b3JhZ2UsICIoTmV0d29ya1Byb2Nlc3MpIGVycm9yIGNyZWF0aW5nIGlvIGNoYW5uZWwgJWQi LCBlcnJvcik7CkBAIC0yNjYsNyArMjY2LDcgQEAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxOZXR3 b3JrQ2FjaGVTdG9yYQogICAgIGlmIChtZXRhRGF0YS5ib2R5T2Zmc2V0ICsgbWV0YURhdGEuYm9k eVNpemUgIT0gZGlzcGF0Y2hfZGF0YV9nZXRfc2l6ZShmaWxlRGF0YSkpCiAgICAgICAgIHJldHVy biBudWxscHRyOwogCi0gICAgYXV0byBoZWFkZXJEYXRhID0gYWRvcHRPU09iamVjdChkaXNwYXRj aF9kYXRhX2NyZWF0ZV9zdWJyYW5nZShmaWxlRGF0YSwgbWV0YURhdGEuaGVhZGVyT2Zmc2V0LCBt ZXRhRGF0YS5oZWFkZXJTaXplKSk7CisgICAgYXV0byBoZWFkZXJEYXRhID0gYWRvcHREaXNwYXRj aChkaXNwYXRjaF9kYXRhX2NyZWF0ZV9zdWJyYW5nZShmaWxlRGF0YSwgbWV0YURhdGEuaGVhZGVy T2Zmc2V0LCBtZXRhRGF0YS5oZWFkZXJTaXplKSk7CiAgICAgaWYgKG1ldGFEYXRhLmhlYWRlckNo ZWNrc3VtICE9IGhhc2hEYXRhKGhlYWRlckRhdGEuZ2V0KCkpKSB7CiAgICAgICAgIExPRyhOZXR3 b3JrQ2FjaGVTdG9yYWdlLCAiKE5ldHdvcmtQcm9jZXNzKSBoZWFkZXIgY2hlY2tzdW0gbWlzbWF0 Y2giKTsKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CkBAIC0yNzgsNyArMjc4LDcgQEAgc3RhdGlj IHN0ZDo6dW5pcXVlX3B0cjxOZXR3b3JrQ2FjaGVTdG9yYQogICAgICAgICByZXR1cm4gbnVsbHB0 cjsKICAgICB9CiAKLSAgICBhdXRvIGJvZHlEYXRhID0gYWRvcHRPU09iamVjdChkaXNwYXRjaF9k YXRhX2NyZWF0ZShtYXAsIG1ldGFEYXRhLmJvZHlTaXplLCBkaXNwYXRjaF9nZXRfbWFpbl9xdWV1 ZSgpLCBbbWFwLCBtYXBTaXplXSB7CisgICAgYXV0byBib2R5RGF0YSA9IGFkb3B0RGlzcGF0Y2go ZGlzcGF0Y2hfZGF0YV9jcmVhdGUobWFwLCBtZXRhRGF0YS5ib2R5U2l6ZSwgZGlzcGF0Y2hfZ2V0 X21haW5fcXVldWUoKSwgW21hcCwgbWFwU2l6ZV0gewogICAgICAgICBtdW5tYXAobWFwLCBtYXBT aXplKTsKICAgICB9KSk7CiAKQEAgLTI5NCw3ICsyOTQsNyBAQCBzdGF0aWMgc3RkOjp1bmlxdWVf cHRyPE5ldHdvcmtDYWNoZVN0b3JhCiAgICAgfSk7CiB9CiAKLXN0YXRpYyBPU09iamVjdFB0cjxk aXNwYXRjaF9kYXRhX3Q+IGVuY29kZUVudHJ5TWV0YURhdGEoY29uc3QgRW50cnlNZXRhRGF0YSYg ZW50cnkpCitzdGF0aWMgRGlzcGF0Y2hQdHI8ZGlzcGF0Y2hfZGF0YV90PiBlbmNvZGVFbnRyeU1l dGFEYXRhKGNvbnN0IEVudHJ5TWV0YURhdGEmIGVudHJ5KQogewogICAgIE5ldHdvcmtDYWNoZUVu Y29kZXIgZW5jb2RlcjsKIApAQCAtMzA4LDEwICszMDgsMTAgQEAgc3RhdGljIE9TT2JqZWN0UHRy PGRpc3BhdGNoX2RhdGFfdD4gZW5jbwogCiAgICAgZW5jb2Rlci5lbmNvZGVDaGVja3N1bSgpOwog Ci0gICAgcmV0dXJuIGFkb3B0T1NPYmplY3QoZGlzcGF0Y2hfZGF0YV9jcmVhdGUoZW5jb2Rlci5i dWZmZXIoKSwgZW5jb2Rlci5idWZmZXJTaXplKCksIG51bGxwdHIsIERJU1BBVENIX0RBVEFfREVT VFJVQ1RPUl9ERUZBVUxUKSk7CisgICAgcmV0dXJuIGFkb3B0RGlzcGF0Y2goZGlzcGF0Y2hfZGF0 YV9jcmVhdGUoZW5jb2Rlci5idWZmZXIoKSwgZW5jb2Rlci5idWZmZXJTaXplKCksIG51bGxwdHIs IERJU1BBVENIX0RBVEFfREVTVFJVQ1RPUl9ERUZBVUxUKSk7CiB9CiAKLXN0YXRpYyBPU09iamVj dFB0cjxkaXNwYXRjaF9kYXRhX3Q+IGVuY29kZUVudHJ5KGNvbnN0IE5ldHdvcmtDYWNoZUtleSYg a2V5LCBjb25zdCBOZXR3b3JrQ2FjaGVTdG9yYWdlOjpFbnRyeSYgZW50cnkpCitzdGF0aWMgRGlz cGF0Y2hQdHI8ZGlzcGF0Y2hfZGF0YV90PiBlbmNvZGVFbnRyeShjb25zdCBOZXR3b3JrQ2FjaGVL ZXkmIGtleSwgY29uc3QgTmV0d29ya0NhY2hlU3RvcmFnZTo6RW50cnkmIGVudHJ5KQogewogICAg IEVudHJ5TWV0YURhdGEgbWV0YURhdGEoa2V5KTsKICAgICBtZXRhRGF0YS50aW1lU3RhbXAgPSBl bnRyeS50aW1lU3RhbXA7CkBAIC0zMjEsMTggKzMyMSwxOCBAQCBzdGF0aWMgT1NPYmplY3RQdHI8 ZGlzcGF0Y2hfZGF0YV90PiBlbmNvCiAgICAgbWV0YURhdGEuYm9keVNpemUgPSBlbnRyeS5ib2R5 LnNpemUoKTsKIAogICAgIGF1dG8gZW5jb2RlZE1ldGFEYXRhID0gZW5jb2RlRW50cnlNZXRhRGF0 YShtZXRhRGF0YSk7Ci0gICAgYXV0byBoZWFkZXJEYXRhID0gYWRvcHRPU09iamVjdChkaXNwYXRj aF9kYXRhX2NyZWF0ZV9jb25jYXQoZW5jb2RlZE1ldGFEYXRhLmdldCgpLCBlbnRyeS5oZWFkZXIu ZGlzcGF0Y2hEYXRhKCkpKTsKKyAgICBhdXRvIGhlYWRlckRhdGEgPSBhZG9wdERpc3BhdGNoKGRp c3BhdGNoX2RhdGFfY3JlYXRlX2NvbmNhdChlbmNvZGVkTWV0YURhdGEuZ2V0KCksIGVudHJ5Lmhl YWRlci5kaXNwYXRjaERhdGEoKSkpOwogICAgIGlmICghZW50cnkuYm9keS5zaXplKCkpCiAgICAg ICAgIHJldHVybiBoZWFkZXJEYXRhOwogCiAgICAgc2l6ZV90IGhlYWRlclNpemUgPSBkaXNwYXRj aF9kYXRhX2dldF9zaXplKGhlYWRlckRhdGEuZ2V0KCkpOwogICAgIHNpemVfdCBkYXRhT2Zmc2V0 ID0gcm91bmRfcGFnZShoZWFkZXJTaXplKTsKICAgICBWZWN0b3I8dWludDhfdCwgNDA5Nj4gZmls bGVyKGRhdGFPZmZzZXQgLSBoZWFkZXJTaXplLCAwKTsKLSAgICBPU09iamVjdFB0cjxkaXNwYXRj aF9kYXRhX3Q+IGFsaWdubWVudERhdGEgPSBhZG9wdE9TT2JqZWN0KGRpc3BhdGNoX2RhdGFfY3Jl YXRlKGZpbGxlci5kYXRhKCksIGZpbGxlci5zaXplKCksIG51bGxwdHIsIERJU1BBVENIX0RBVEFf REVTVFJVQ1RPUl9ERUZBVUxUKSk7CisgICAgYXV0byBhbGlnbm1lbnREYXRhID0gYWRvcHREaXNw YXRjaChkaXNwYXRjaF9kYXRhX2NyZWF0ZShmaWxsZXIuZGF0YSgpLCBmaWxsZXIuc2l6ZSgpLCBu dWxscHRyLCBESVNQQVRDSF9EQVRBX0RFU1RSVUNUT1JfREVGQVVMVCkpOwogCi0gICAgT1NPYmpl Y3RQdHI8ZGlzcGF0Y2hfZGF0YV90PiBoZWFkZXJXaXRoQWxpZ25tZW50RGF0YSA9IGFkb3B0T1NP YmplY3QoZGlzcGF0Y2hfZGF0YV9jcmVhdGVfY29uY2F0KGhlYWRlckRhdGEuZ2V0KCksIGFsaWdu bWVudERhdGEuZ2V0KCkpKTsKKyAgICBhdXRvIGhlYWRlcldpdGhBbGlnbm1lbnREYXRhID0gYWRv cHREaXNwYXRjaChkaXNwYXRjaF9kYXRhX2NyZWF0ZV9jb25jYXQoaGVhZGVyRGF0YS5nZXQoKSwg YWxpZ25tZW50RGF0YS5nZXQoKSkpOwogCi0gICAgcmV0dXJuIGFkb3B0T1NPYmplY3QoZGlzcGF0 Y2hfZGF0YV9jcmVhdGVfY29uY2F0KGhlYWRlcldpdGhBbGlnbm1lbnREYXRhLmdldCgpLCBlbnRy eS5ib2R5LmRpc3BhdGNoRGF0YSgpKSk7CisgICAgcmV0dXJuIGFkb3B0RGlzcGF0Y2goZGlzcGF0 Y2hfZGF0YV9jcmVhdGVfY29uY2F0KGhlYWRlcldpdGhBbGlnbm1lbnREYXRhLmdldCgpLCBlbnRy eS5ib2R5LmRpc3BhdGNoRGF0YSgpKSk7CiB9CiAKIHZvaWQgTmV0d29ya0NhY2hlU3RvcmFnZTo6 cmVtb3ZlRW50cnkoY29uc3QgTmV0d29ya0NhY2hlS2V5JiBrZXkpCg==