177706 2017-09-30 01:48:53 -0700 Add makeWeakPtr for easier WeakPtr construction 2017-09-30 13:11:33 -0700 1 1 1 Unclassified WebKit Web Template Framework WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned commit-queue ggaren jiewen_tan rniwa sam webkit-bug-importer zalan oldest_to_newest 1354881 0 koivisto 2017-09-30 01:48:53 -0700 Better WeakPtr construction. 1354890 1 322291 koivisto 2017-09-30 02:07:58 -0700 Created attachment 322291 patch 1354892 2 322291 sam 2017-09-30 02:16:39 -0700 Comment on attachment 322291 patch r=me. I would separate out the operator bool change, since that will probably require some API test changes. 1354900 3 322294 koivisto 2017-09-30 04:42:58 -0700 Created attachment 322294 patch 1354904 4 322294 commit-queue 2017-09-30 06:44:07 -0700 Comment on attachment 322294 patch Clearing flags on attachment: 322294 Committed r222682: <http://trac.webkit.org/changeset/222682> 1354905 5 commit-queue 2017-09-30 06:44:09 -0700 All reviewed patches have been landed. Closing bug. 1354906 6 webkit-bug-importer 2017-09-30 06:45:30 -0700 <rdar://problem/34755419> 1354913 7 rniwa 2017-09-30 13:11:33 -0700 We can also add variants of makeWeakPtr which takes RefPtr & Ref! 322291 2017-09-30 02:07:58 -0700 2017-09-30 04:42:58 -0700 patch makeweak.patch text/plain 8270 koivisto SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyMjI2NzkpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE3LTA5LTMwICBBbnR0aSBLb2l2aXN0byAgPGFu dHRpQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgbWFrZVdlYWtQdHIgZm9yIGVhc2llciBXZWFr UHRyIGNvbnN0cnVjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTc3NzA2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgU3RhbmRhbG9uZSBtYWtlV2Vha1B0cigpIHJldHVybnMgYSBXZWFrUHRyIG9mIHRo ZSBzYW1lIHR5cGUgYXMgdGhlIGFyZ3VtZW50LgorCisgICAgICAgIEZvciB0aGlzIHRvIHdvcmsg dGhlIGFyZ3VtZW50IHR5cGUgbmVlZHMgb25seSB0byBleHBvc2UgYSAocG9zc2libHkgYmFzZSB0 eXBlKSBXZWFrUHRyRmFjdG9yeQorICAgICAgICBhcyBhIHB1YmxpYyB3ZWFrUHRyRmFjdG9yeSgp IG1lbWJlciBmdW5jdGlvbi4KKworICAgICAgICAqIHd0Zi9XZWFrUHRyLmg6CisgICAgICAgIChX VEY6OldlYWtQdHI6Om9wZXJhdG9yIGJvb2wgY29uc3QpOiBBbHNvIG1ha2Ugb3BlcmF0b3IgYm9v bCBleHBsaWNpdC4KKyAgICAgICAgKFdURjo6V2Vha1B0cjo6b3BlcmF0b3ItPiBjb25zdCk6Cisg ICAgICAgIChXVEY6OldlYWtQdHI6Om9wZXJhdG9yKiBjb25zdCk6IEFsc28gYWRkIG9wZXJhdG9y Ki4KKyAgICAgICAgKFdURjo6bWFrZVdlYWtQdHIpOgorCiAyMDE3LTA5LTI4ICBKaWV3ZW4gVGFu ICA8amlld2VuX3RhbkBhcHBsZS5jb20+CiAKICAgICAgICAgV2Vha1B0ckZhY3Rvcnkgc2hvdWxk IGFsbG93IGRvd25jYXN0aW5nCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9XZWFrUHRyLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dURi93dGYvV2Vha1B0ci5oCShyZXZpc2lvbiAyMjI2NzkpCisrKyBT b3VyY2UvV1RGL3d0Zi9XZWFrUHRyLmgJKHdvcmtpbmcgY29weSkKQEAgLTcxLDEyICs3MSwxMyBA QCBwdWJsaWM6CiAgICAgV2Vha1B0cihSZWY8V2Vha1JlZmVyZW5jZTxUPj4mJiByZWYpIDogbV9y ZWYoc3RkOjpmb3J3YXJkPFJlZjxXZWFrUmVmZXJlbmNlPFQ+Pj4ocmVmKSkgeyB9CiAKICAgICBU KiBnZXQoKSBjb25zdCB7IHJldHVybiBtX3JlZi0+Z2V0KCk7IH0KLSAgICBvcGVyYXRvciBib29s KCkgY29uc3QgeyByZXR1cm4gbV9yZWYtPmdldCgpOyB9CisgICAgZXhwbGljaXQgb3BlcmF0b3Ig Ym9vbCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVmLT5nZXQoKTsgfQogCiAgICAgV2Vha1B0ciYgb3Bl cmF0b3I9KGNvbnN0IFdlYWtQdHImIG8pIHsgbV9yZWYgPSBvLm1fcmVmLmNvcHlSZWYoKTsgcmV0 dXJuICp0aGlzOyB9CiAgICAgV2Vha1B0ciYgb3BlcmF0b3I9KHN0ZDo6bnVsbHB0cl90KSB7IG1f cmVmID0gV2Vha1JlZmVyZW5jZTxUPjo6Y3JlYXRlKG51bGxwdHIpOyByZXR1cm4gKnRoaXM7IH0K IAotICAgIFQqIG9wZXJhdG9yLT4oKSBjb25zdCB7IHJldHVybiBtX3JlZi0+Z2V0KCk7IH0KKyAg ICBUKiBvcGVyYXRvci0+KCkgY29uc3QgeyByZXR1cm4gZ2V0KCk7IH0KKyAgICBUJiBvcGVyYXRv ciooKSBjb25zdCB7IHJldHVybiAqZ2V0KCk7IH0KIAogICAgIHZvaWQgY2xlYXIoKSB7IG1fcmVm ID0gV2Vha1JlZmVyZW5jZTxUPjo6Y3JlYXRlKG51bGxwdHIpOyB9CiAKQEAgLTEyMCw2ICsxMjEs MTEgQEAgcHJpdmF0ZToKICAgICBtdXRhYmxlIFJlZlB0cjxXZWFrUmVmZXJlbmNlPFQ+PiBtX3Jl ZjsKIH07CiAKK3RlbXBsYXRlIDx0eXBlbmFtZSBUPiBpbmxpbmUgV2Vha1B0cjxUPiBtYWtlV2Vh a1B0cihUJiByZWYpCit7CisgICAgcmV0dXJuIHJlZi53ZWFrUHRyRmFjdG9yeSgpLnRlbXBsYXRl IGNyZWF0ZVdlYWtQdHI8VD4ocmVmKTsKK30KKwogdGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5h bWUgVT4gaW5saW5lIGJvb2wgb3BlcmF0b3I9PShjb25zdCBXZWFrUHRyPFQ+JiBhLCBjb25zdCBX ZWFrUHRyPFU+JiBiKQogewogICAgIHJldHVybiBhLmdldCgpID09IGIuZ2V0KCk7CkBAIC0xNTUs NSArMTYxLDYgQEAgdGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUgVT4gaW5saW5lIAogdXNp bmcgV1RGOjpXZWFrUHRyOwogdXNpbmcgV1RGOjpXZWFrUHRyRmFjdG9yeTsKIHVzaW5nIFdURjo6 V2Vha1JlZmVyZW5jZTsKK3VzaW5nIFdURjo6bWFrZVdlYWtQdHI7CiAKICNlbmRpZgpJbmRleDog U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwkocmV2aXNpb24gMjIyNjc5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCSh3 b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjggQEAKKzIwMTctMDktMzAgIEFudHRpIEtvaXZpc3Rv ICA8YW50dGlAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBtYWtlV2Vha1B0ciBmb3IgZWFzaWVy IFdlYWtQdHIgY29uc3RydWN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNzc3MDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBVc2UgaXQgaW4gcmVuZGVyIHRyZWUuCisKKyAgICAgICAgKiBsb2FkZXIv U3ViZnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3ViZnJhbWVMb2FkZXI6Omxv YWRQbHVnaW4pOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lVmlldzo6dXBkYXRlRW1iZWRkZWRPYmplY3QpOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJNdWx0aUNvbHVtbkZsb3cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTXVs dGlDb2x1bW5GbG93OjpmcmFnbWVudGVkRmxvd0Rlc2NlbmRhbnRJbnNlcnRlZCk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2Jq ZWN0Ojp3ZWFrRmFjdG9yeSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6 OmNyZWF0ZVdlYWtQdHIpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJWaWV3 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclZpZXc6OlJlcGFpbnRSZWdpb25BY2N1bXVs YXRvcjo6UmVwYWludFJlZ2lvbkFjY3VtdWxhdG9yKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyV2lkZ2V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlcldpZGdldDo6c2V0V2lkZ2V0 R2VvbWV0cnkpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyV2lkZ2V0OjpzZXRXaWRnZXQpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyV2lkZ2V0Ojp1cGRhdGVXaWRnZXRQb3NpdGlvbik6CisK IDIwMTctMDktMjkgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAg IFVzZSBzbWFydCBwb2ludGVycyBmb3IgY3JlYXRpbmcsIGFkZGluZyBhbmQgcmVtb3ZpbmcgcmVu ZGVyZXJzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJmcmFtZUxvYWRlci5jcHAJKHJl dmlzaW9uIDIyMjY3OSkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJmcmFtZUxvYWRlci5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTQxMSw3ICs0MTEsNyBAQCBib29sIFN1YmZyYW1lTG9hZGVy Ojpsb2FkUGx1Z2luKEhUTUxQbHVnCiAgICAgICAgIGxvYWRNYW51YWxseSA9IGZhbHNlOwogI2Vu ZGlmCiAKLSAgICBhdXRvIHdlYWtSZW5kZXJlciA9IHJlbmRlcmVyLT5jcmVhdGVXZWFrUHRyPFJl bmRlckVtYmVkZGVkT2JqZWN0PigpOworICAgIGF1dG8gd2Vha1JlbmRlcmVyID0gbWFrZVdlYWtQ dHIoKnJlbmRlcmVyKTsKIAogICAgIGF1dG8gd2lkZ2V0ID0gbV9mcmFtZS5sb2FkZXIoKS5jbGll bnQoKS5jcmVhdGVQbHVnaW4oY29udGVudFNpemUsIHBsdWdpbkVsZW1lbnQsIHVybCwgcGFyYW1O YW1lcywgcGFyYW1WYWx1ZXMsIG1pbWVUeXBlLCBsb2FkTWFudWFsbHkpOwogCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuY3BwCShyZXZpc2lvbiAyMjI2NzkpCisrKyBTb3VyY2UvV2ViQ29y ZS9wYWdlL0ZyYW1lVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0NDEsNyArMzQ0MSw3IEBA IHZvaWQgRnJhbWVWaWV3Ojp1cGRhdGVFbWJlZGRlZE9iamVjdChSZW4KICAgICAgICAgcmV0dXJu OwogICAgIH0KIAotICAgIGF1dG8gd2Vha1JlbmRlcmVyID0gZW1iZWRkZWRPYmplY3QuY3JlYXRl V2Vha1B0cjxSZW5kZXJFbWJlZGRlZE9iamVjdD4oKTsKKyAgICBhdXRvIHdlYWtSZW5kZXJlciA9 IG1ha2VXZWFrUHRyKGVtYmVkZGVkT2JqZWN0KTsKIAogICAgIC8vIEZJWE1FOiBUaGlzIGNvdWxk IHR1cm4gaW50byBhIHJlYWwgdmlydHVhbCBkaXNwYXRjaCBpZiB3ZSBkZWZpbmVkCiAgICAgLy8g dXBkYXRlV2lkZ2V0KFBsdWdpbkNyZWF0aW9uT3B0aW9uKSBvbiBIVE1MRWxlbWVudC4KSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3cuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3cu Y3BwCShyZXZpc2lvbiAyMjI2NzkpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TXVsdGlDb2x1bW5GbG93LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQzLDcgKzQ0Myw3IEBAIHZv aWQgUmVuZGVyTXVsdGlDb2x1bW5GbG93OjpmcmFnbWVudGVkRmwKICAgICAgICAgICAgIH0KICAg ICAgICAgICAgIAogICAgICAgICAgICAgQVNTRVJUKCFtX3NwYW5uZXJNYXAuZ2V0KHBsYWNlaG9s ZGVyLnNwYW5uZXIoKSkpOwotICAgICAgICAgICAgbV9zcGFubmVyTWFwLmFkZChwbGFjZWhvbGRl ci5zcGFubmVyKCksIHBsYWNlaG9sZGVyLmNyZWF0ZVdlYWtQdHI8UmVuZGVyTXVsdGlDb2x1bW5T cGFubmVyUGxhY2Vob2xkZXI+KCkpOworICAgICAgICAgICAgbV9zcGFubmVyTWFwLmFkZChwbGFj ZWhvbGRlci5zcGFubmVyKCksIG1ha2VXZWFrUHRyKHBsYWNlaG9sZGVyKSk7CiAgICAgICAgICAg ICBBU1NFUlQoIXBsYWNlaG9sZGVyLmZpcnN0Q2hpbGQoKSk7IC8vIFRoZXJlIHNob3VsZCBiZSBu byBjaGlsZHJlbiBoZXJlLCBidXQgaWYgdGhlcmUgYXJlLCB3ZSBvdWdodCB0byBza2lwIHRoZW0u CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQpJbmRleDogU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJPYmplY3QuaAkocmV2aXNpb24gMjIyNjc5KQorKysgU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDksOCArMTA5 LDcgQEAgcHVibGljOgogICAgIGV4cGxpY2l0IFJlbmRlck9iamVjdChOb2RlJik7CiAgICAgdmly dHVhbCB+UmVuZGVyT2JqZWN0KCk7CiAKLSAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPgotICAgIFdl YWtQdHI8VD4gY3JlYXRlV2Vha1B0cigpIHsgcmV0dXJuIG1fd2Vha0ZhY3RvcnkuY3JlYXRlV2Vh a1B0cjxUPigqdGhpcyk7IH0KKyAgICBhdXRvJiB3ZWFrUHRyRmFjdG9yeSgpIGNvbnN0IHsgcmV0 dXJuIG1fd2Vha0ZhY3Rvcnk7IH0KIAogICAgIFJlbmRlclRoZW1lJiB0aGVtZSgpIGNvbnN0Owog CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCShyZXZpc2lvbiAy MjI2NzkpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTEyNjUsNyArMTI2NSw3IEBAIFJlbmRlclZpZXc6OlJlcGFpbnRSZWdpb25B Y2N1bXVsYXRvcjo6UmUKICAgICBtX3dhc0FjY3VtdWxhdGluZ1JlcGFpbnRSZWdpb24gPSAhIXJv b3RSZW5kZXJWaWV3LT5tX2FjY3VtdWxhdGVkUmVwYWludFJlZ2lvbjsKICAgICBpZiAoIW1fd2Fz QWNjdW11bGF0aW5nUmVwYWludFJlZ2lvbikKICAgICAgICAgcm9vdFJlbmRlclZpZXctPm1fYWNj dW11bGF0ZWRSZXBhaW50UmVnaW9uID0gc3RkOjptYWtlX3VuaXF1ZTxSZWdpb24+KCk7Ci0gICAg bV9yb290VmlldyA9IHJvb3RSZW5kZXJWaWV3LT5jcmVhdGVXZWFrUHRyPFJlbmRlclZpZXc+KCk7 CisgICAgbV9yb290VmlldyA9IG1ha2VXZWFrUHRyKCpyb290UmVuZGVyVmlldyk7CiB9CiAKIFJl bmRlclZpZXc6OlJlcGFpbnRSZWdpb25BY2N1bXVsYXRvcjo6flJlcGFpbnRSZWdpb25BY2N1bXVs YXRvcigpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyV2lkZ2V0LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyV2lkZ2V0LmNwcAko cmV2aXNpb24gMjIyNjc5KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcldpZGdl dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyOCw3ICsxMjgsNyBAQCBib29sIFJlbmRlcldpZGdl dDo6c2V0V2lkZ2V0R2VvbWV0cnkoY29uCiAKICAgICBtX2NsaXBSZWN0ID0gY2xpcFJlY3Q7CiAK LSAgICBhdXRvIHdlYWtUaGlzID0gY3JlYXRlV2Vha1B0cjxSZW5kZXJXaWRnZXQ+KCk7CisgICAg YXV0byB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKTsKICAgICAvLyBUaGVzZSBjYWxscyAq bWF5KiBjYXVzZSB0aGlzIHJlbmRlcmVyIHRvIGRpc2FwcGVhciBmcm9tIHVuZGVybmVhdGguLi4K ICAgICBpZiAoYm91bmRzQ2hhbmdlZCkKICAgICAgICAgbV93aWRnZXQtPnNldEZyYW1lUmVjdChu ZXdGcmFtZVJlY3QpOwpAQCAtMTc4LDcgKzE3OCw3IEBAIHZvaWQgUmVuZGVyV2lkZ2V0OjpzZXRX aWRnZXQoUmVmUHRyPFdpZGcKICAgICAgICAgLy8gd2lkZ2V0IGltbWVkaWF0ZWx5LCBidXQgd2Ug aGF2ZSB0byBoYXZlIHJlYWxseSBiZWVuIGZ1bGx5IGNvbnN0cnVjdGVkLgogICAgICAgICBpZiAo aGFzSW5pdGlhbGl6ZWRTdHlsZSgpKSB7CiAgICAgICAgICAgICBpZiAoIW5lZWRzTGF5b3V0KCkp IHsKLSAgICAgICAgICAgICAgICBhdXRvIHdlYWtUaGlzID0gY3JlYXRlV2Vha1B0cjxSZW5kZXJX aWRnZXQ+KCk7CisgICAgICAgICAgICAgICAgYXV0byB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0 aGlzKTsKICAgICAgICAgICAgICAgICB1cGRhdGVXaWRnZXRHZW9tZXRyeSgpOwogICAgICAgICAg ICAgICAgIGlmICghd2Vha1RoaXMpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKQEAgLTMy Miw3ICszMjIsNyBAQCBSZW5kZXJXaWRnZXQ6OkNoaWxkV2lkZ2V0U3RhdGUgUmVuZGVyV2lkCiAg ICAgaWYgKCFtX3dpZGdldCkKICAgICAgICAgcmV0dXJuIENoaWxkV2lkZ2V0U3RhdGU6OkRlc3Ry b3llZDsKIAotICAgIGF1dG8gd2Vha1RoaXMgPSBjcmVhdGVXZWFrUHRyPFJlbmRlcldpZGdldD4o KTsKKyAgICBhdXRvIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpOwogICAgIGJvb2wgd2lk Z2V0U2l6ZUNoYW5nZWQgPSB1cGRhdGVXaWRnZXRHZW9tZXRyeSgpOwogICAgIGlmICghd2Vha1Ro aXMgfHwgIW1fd2lkZ2V0KQogICAgICAgICByZXR1cm4gQ2hpbGRXaWRnZXRTdGF0ZTo6RGVzdHJv eWVkOwo= 322294 2017-09-30 04:42:58 -0700 2017-09-30 06:44:07 -0700 patch makeweak-2.patch text/plain 7917 koivisto SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyMjI2NzkpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE3LTA5LTMwICBBbnR0aSBLb2l2aXN0byAgPGFu dHRpQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgbWFrZVdlYWtQdHIgZm9yIGVhc2llciBXZWFr UHRyIGNvbnN0cnVjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTc3NzA2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KKworICAg ICAgICBTdGFuZGFsb25lIG1ha2VXZWFrUHRyKCkgcmV0dXJucyBhIFdlYWtQdHIgb2YgdGhlIHNh bWUgdHlwZSBhcyB0aGUgYXJndW1lbnQuCisKKyAgICAgICAgRm9yIHRoaXMgdG8gd29yayB0aGUg YXJndW1lbnQgdHlwZSBuZWVkcyB0byBleHBvc2UgYSAocG9zc2libHkgYmFzZSB0eXBlKSBXZWFr UHRyRmFjdG9yeQorICAgICAgICBhcyBhIHB1YmxpYyB3ZWFrUHRyRmFjdG9yeSgpIG1lbWJlciBm dW5jdGlvbi4KKworICAgICAgICAqIHd0Zi9XZWFrUHRyLmg6CisgICAgICAgIChXVEY6OldlYWtQ dHI6Om9wZXJhdG9yLT4gY29uc3QpOgorICAgICAgICAoV1RGOjpXZWFrUHRyOjpvcGVyYXRvciog Y29uc3QpOiBBbHNvIGFkZCBvcGVyYXRvciouCisgICAgICAgIChXVEY6Om1ha2VXZWFrUHRyKToK KwogMjAxNy0wOS0yOCAgSmlld2VuIFRhbiAgPGppZXdlbl90YW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFdlYWtQdHJGYWN0b3J5IHNob3VsZCBhbGxvdyBkb3duY2FzdGluZwpJbmRleDogU291cmNl L1dURi93dGYvV2Vha1B0ci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL1dlYWtQdHIu aAkocmV2aXNpb24gMjIyNjc5KQorKysgU291cmNlL1dURi93dGYvV2Vha1B0ci5oCSh3b3JraW5n IGNvcHkpCkBAIC03Niw3ICs3Niw4IEBAIHB1YmxpYzoKICAgICBXZWFrUHRyJiBvcGVyYXRvcj0o Y29uc3QgV2Vha1B0ciYgbykgeyBtX3JlZiA9IG8ubV9yZWYuY29weVJlZigpOyByZXR1cm4gKnRo aXM7IH0KICAgICBXZWFrUHRyJiBvcGVyYXRvcj0oc3RkOjpudWxscHRyX3QpIHsgbV9yZWYgPSBX ZWFrUmVmZXJlbmNlPFQ+OjpjcmVhdGUobnVsbHB0cik7IHJldHVybiAqdGhpczsgfQogCi0gICAg VCogb3BlcmF0b3ItPigpIGNvbnN0IHsgcmV0dXJuIG1fcmVmLT5nZXQoKTsgfQorICAgIFQqIG9w ZXJhdG9yLT4oKSBjb25zdCB7IHJldHVybiBnZXQoKTsgfQorICAgIFQmIG9wZXJhdG9yKigpIGNv bnN0IHsgcmV0dXJuICpnZXQoKTsgfQogCiAgICAgdm9pZCBjbGVhcigpIHsgbV9yZWYgPSBXZWFr UmVmZXJlbmNlPFQ+OjpjcmVhdGUobnVsbHB0cik7IH0KIApAQCAtMTIwLDYgKzEyMSwxMSBAQCBw cml2YXRlOgogICAgIG11dGFibGUgUmVmUHRyPFdlYWtSZWZlcmVuY2U8VD4+IG1fcmVmOwogfTsK IAordGVtcGxhdGUgPHR5cGVuYW1lIFQ+IGlubGluZSBXZWFrUHRyPFQ+IG1ha2VXZWFrUHRyKFQm IHJlZikKK3sKKyAgICByZXR1cm4gcmVmLndlYWtQdHJGYWN0b3J5KCkudGVtcGxhdGUgY3JlYXRl V2Vha1B0cjxUPihyZWYpOworfQorCiB0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBlbmFtZSBVPiBp bmxpbmUgYm9vbCBvcGVyYXRvcj09KGNvbnN0IFdlYWtQdHI8VD4mIGEsIGNvbnN0IFdlYWtQdHI8 VT4mIGIpCiB7CiAgICAgcmV0dXJuIGEuZ2V0KCkgPT0gYi5nZXQoKTsKQEAgLTE1NSw1ICsxNjEs NiBAQCB0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBlbmFtZSBVPiBpbmxpbmUgCiB1c2luZyBXVEY6 OldlYWtQdHI7CiB1c2luZyBXVEY6OldlYWtQdHJGYWN0b3J5OwogdXNpbmcgV1RGOjpXZWFrUmVm ZXJlbmNlOwordXNpbmcgV1RGOjptYWtlV2Vha1B0cjsKIAogI2VuZGlmCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMjI2NzkpCisrKyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcg Y29weSkKQEAgLTEsMyArMSwyOCBAQAorMjAxNy0wOS0zMCAgQW50dGkgS29pdmlzdG8gIDxhbnR0 aUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIG1ha2VXZWFrUHRyIGZvciBlYXNpZXIgV2Vha1B0 ciBjb25zdHJ1Y3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3NzcwNgorCisgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCisKKyAgICAg ICAgVXNlIGl0IGluIHJlbmRlciB0cmVlLgorCisgICAgICAgICogbG9hZGVyL1N1YmZyYW1lTG9h ZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN1YmZyYW1lTG9hZGVyOjpsb2FkUGx1Z2luKToK KyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZp ZXc6OnVwZGF0ZUVtYmVkZGVkT2JqZWN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTXVs dGlDb2x1bW5GbG93LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck11bHRpQ29sdW1uRmxv dzo6ZnJhZ21lbnRlZEZsb3dEZXNjZW5kYW50SW5zZXJ0ZWQpOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJPYmplY3QuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6d2Vha0Zh Y3RvcnkgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0OjpjcmVhdGVXZWFr UHRyKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVmlldy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJWaWV3OjpSZXBhaW50UmVnaW9uQWNjdW11bGF0b3I6OlJlcGFp bnRSZWdpb25BY2N1bXVsYXRvcik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlcldpZGdldC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJXaWRnZXQ6OnNldFdpZGdldEdlb21ldHJ5KToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlcldpZGdldDo6c2V0V2lkZ2V0KToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlcldpZGdldDo6dXBkYXRlV2lkZ2V0UG9zaXRpb24pOgorCiAyMDE3LTA5LTI5 ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2Ugc21hcnQg cG9pbnRlcnMgZm9yIGNyZWF0aW5nLCBhZGRpbmcgYW5kIHJlbW92aW5nIHJlbmRlcmVycwpJbmRl eDogU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YmZyYW1lTG9hZGVyLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIuY3BwCShyZXZpc2lvbiAyMjI2 NzkpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC00MTEsNyArNDExLDcgQEAgYm9vbCBTdWJmcmFtZUxvYWRlcjo6bG9hZFBsdWdp bihIVE1MUGx1ZwogICAgICAgICBsb2FkTWFudWFsbHkgPSBmYWxzZTsKICNlbmRpZgogCi0gICAg YXV0byB3ZWFrUmVuZGVyZXIgPSByZW5kZXJlci0+Y3JlYXRlV2Vha1B0cjxSZW5kZXJFbWJlZGRl ZE9iamVjdD4oKTsKKyAgICBhdXRvIHdlYWtSZW5kZXJlciA9IG1ha2VXZWFrUHRyKCpyZW5kZXJl cik7CiAKICAgICBhdXRvIHdpZGdldCA9IG1fZnJhbWUubG9hZGVyKCkuY2xpZW50KCkuY3JlYXRl UGx1Z2luKGNvbnRlbnRTaXplLCBwbHVnaW5FbGVtZW50LCB1cmwsIHBhcmFtTmFtZXMsIHBhcmFt VmFsdWVzLCBtaW1lVHlwZSwgbG9hZE1hbnVhbGx5KTsKIApJbmRleDogU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWVWaWV3LmNwcAkocmV2aXNpb24gMjIyNjc5KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNDQxLDcgKzM0NDEsNyBAQCB2b2lkIEZyYW1l Vmlldzo6dXBkYXRlRW1iZWRkZWRPYmplY3QoUmVuCiAgICAgICAgIHJldHVybjsKICAgICB9CiAK LSAgICBhdXRvIHdlYWtSZW5kZXJlciA9IGVtYmVkZGVkT2JqZWN0LmNyZWF0ZVdlYWtQdHI8UmVu ZGVyRW1iZWRkZWRPYmplY3Q+KCk7CisgICAgYXV0byB3ZWFrUmVuZGVyZXIgPSBtYWtlV2Vha1B0 cihlbWJlZGRlZE9iamVjdCk7CiAKICAgICAvLyBGSVhNRTogVGhpcyBjb3VsZCB0dXJuIGludG8g YSByZWFsIHZpcnR1YWwgZGlzcGF0Y2ggaWYgd2UgZGVmaW5lZAogICAgIC8vIHVwZGF0ZVdpZGdl dChQbHVnaW5DcmVhdGlvbk9wdGlvbikgb24gSFRNTEVsZW1lbnQuCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5GbG93LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5GbG93LmNwcAkocmV2aXNp b24gMjIyNjc5KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1u Rmxvdy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ0Myw3ICs0NDMsNyBAQCB2b2lkIFJlbmRlck11 bHRpQ29sdW1uRmxvdzo6ZnJhZ21lbnRlZEZsCiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAK ICAgICAgICAgICAgIEFTU0VSVCghbV9zcGFubmVyTWFwLmdldChwbGFjZWhvbGRlci5zcGFubmVy KCkpKTsKLSAgICAgICAgICAgIG1fc3Bhbm5lck1hcC5hZGQocGxhY2Vob2xkZXIuc3Bhbm5lcigp LCBwbGFjZWhvbGRlci5jcmVhdGVXZWFrUHRyPFJlbmRlck11bHRpQ29sdW1uU3Bhbm5lclBsYWNl aG9sZGVyPigpKTsKKyAgICAgICAgICAgIG1fc3Bhbm5lck1hcC5hZGQocGxhY2Vob2xkZXIuc3Bh bm5lcigpLCBtYWtlV2Vha1B0cihwbGFjZWhvbGRlcikpOwogICAgICAgICAgICAgQVNTRVJUKCFw bGFjZWhvbGRlci5maXJzdENoaWxkKCkpOyAvLyBUaGVyZSBzaG91bGQgYmUgbm8gY2hpbGRyZW4g aGVyZSwgYnV0IGlmIHRoZXJlIGFyZSwgd2Ugb3VnaHQgdG8gc2tpcCB0aGVtLgogICAgICAgICAg ICAgY29udGludWU7CiAgICAgICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyT2JqZWN0LmgJKHJldmlzaW9uIDIyMjY3OSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJPYmplY3QuaAkod29ya2luZyBjb3B5KQpAQCAtMTA5LDggKzEwOSw3IEBAIHB1Ymxp YzoKICAgICBleHBsaWNpdCBSZW5kZXJPYmplY3QoTm9kZSYpOwogICAgIHZpcnR1YWwgflJlbmRl ck9iamVjdCgpOwogCi0gICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4KLSAgICBXZWFrUHRyPFQ+IGNy ZWF0ZVdlYWtQdHIoKSB7IHJldHVybiBtX3dlYWtGYWN0b3J5LmNyZWF0ZVdlYWtQdHI8VD4oKnRo aXMpOyB9CisgICAgYXV0byYgd2Vha1B0ckZhY3RvcnkoKSBjb25zdCB7IHJldHVybiBtX3dlYWtG YWN0b3J5OyB9CiAKICAgICBSZW5kZXJUaGVtZSYgdGhlbWUoKSBjb25zdDsKIApJbmRleDogU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcAkocmV2aXNpb24gMjIyNjc5KQorKysg U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xMjY1LDcgKzEyNjUsNyBAQCBSZW5kZXJWaWV3OjpSZXBhaW50UmVnaW9uQWNjdW11bGF0b3I6 OlJlCiAgICAgbV93YXNBY2N1bXVsYXRpbmdSZXBhaW50UmVnaW9uID0gISFyb290UmVuZGVyVmll dy0+bV9hY2N1bXVsYXRlZFJlcGFpbnRSZWdpb247CiAgICAgaWYgKCFtX3dhc0FjY3VtdWxhdGlu Z1JlcGFpbnRSZWdpb24pCiAgICAgICAgIHJvb3RSZW5kZXJWaWV3LT5tX2FjY3VtdWxhdGVkUmVw YWludFJlZ2lvbiA9IHN0ZDo6bWFrZV91bmlxdWU8UmVnaW9uPigpOwotICAgIG1fcm9vdFZpZXcg PSByb290UmVuZGVyVmlldy0+Y3JlYXRlV2Vha1B0cjxSZW5kZXJWaWV3PigpOworICAgIG1fcm9v dFZpZXcgPSBtYWtlV2Vha1B0cigqcm9vdFJlbmRlclZpZXcpOwogfQogCiBSZW5kZXJWaWV3OjpS ZXBhaW50UmVnaW9uQWNjdW11bGF0b3I6On5SZXBhaW50UmVnaW9uQWNjdW11bGF0b3IoKQpJbmRl eDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcldpZGdldC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcldpZGdldC5jcHAJKHJldmlzaW9uIDIy MjY3OSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJXaWRnZXQuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMjgsNyArMTI4LDcgQEAgYm9vbCBSZW5kZXJXaWRnZXQ6OnNldFdpZGdl dEdlb21ldHJ5KGNvbgogCiAgICAgbV9jbGlwUmVjdCA9IGNsaXBSZWN0OwogCi0gICAgYXV0byB3 ZWFrVGhpcyA9IGNyZWF0ZVdlYWtQdHI8UmVuZGVyV2lkZ2V0PigpOworICAgIGF1dG8gd2Vha1Ro aXMgPSBtYWtlV2Vha1B0cigqdGhpcyk7CiAgICAgLy8gVGhlc2UgY2FsbHMgKm1heSogY2F1c2Ug dGhpcyByZW5kZXJlciB0byBkaXNhcHBlYXIgZnJvbSB1bmRlcm5lYXRoLi4uCiAgICAgaWYgKGJv dW5kc0NoYW5nZWQpCiAgICAgICAgIG1fd2lkZ2V0LT5zZXRGcmFtZVJlY3QobmV3RnJhbWVSZWN0 KTsKQEAgLTE3OCw3ICsxNzgsNyBAQCB2b2lkIFJlbmRlcldpZGdldDo6c2V0V2lkZ2V0KFJlZlB0 cjxXaWRnCiAgICAgICAgIC8vIHdpZGdldCBpbW1lZGlhdGVseSwgYnV0IHdlIGhhdmUgdG8gaGF2 ZSByZWFsbHkgYmVlbiBmdWxseSBjb25zdHJ1Y3RlZC4KICAgICAgICAgaWYgKGhhc0luaXRpYWxp emVkU3R5bGUoKSkgewogICAgICAgICAgICAgaWYgKCFuZWVkc0xheW91dCgpKSB7Ci0gICAgICAg ICAgICAgICAgYXV0byB3ZWFrVGhpcyA9IGNyZWF0ZVdlYWtQdHI8UmVuZGVyV2lkZ2V0PigpOwor ICAgICAgICAgICAgICAgIGF1dG8gd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyk7CiAgICAg ICAgICAgICAgICAgdXBkYXRlV2lkZ2V0R2VvbWV0cnkoKTsKICAgICAgICAgICAgICAgICBpZiAo IXdlYWtUaGlzKQogICAgICAgICAgICAgICAgICAgICByZXR1cm47CkBAIC0zMjIsNyArMzIyLDcg QEAgUmVuZGVyV2lkZ2V0OjpDaGlsZFdpZGdldFN0YXRlIFJlbmRlcldpZAogICAgIGlmICghbV93 aWRnZXQpCiAgICAgICAgIHJldHVybiBDaGlsZFdpZGdldFN0YXRlOjpEZXN0cm95ZWQ7CiAKLSAg ICBhdXRvIHdlYWtUaGlzID0gY3JlYXRlV2Vha1B0cjxSZW5kZXJXaWRnZXQ+KCk7CisgICAgYXV0 byB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKTsKICAgICBib29sIHdpZGdldFNpemVDaGFu Z2VkID0gdXBkYXRlV2lkZ2V0R2VvbWV0cnkoKTsKICAgICBpZiAoIXdlYWtUaGlzIHx8ICFtX3dp ZGdldCkKICAgICAgICAgcmV0dXJuIENoaWxkV2lkZ2V0U3RhdGU6OkRlc3Ryb3llZDsK