185422 2018-05-08 07:14:59 -0700 Don't use mapped cache files in case of Class A/B protected app 2018-05-08 09:15:26 -0700 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned beidson cdumez cgarcia commit-queue ddkilzer ews-watchlist ggaren oldest_to_newest 1421713 0 koivisto 2018-05-08 07:14:59 -0700 Currently we don't use shared memory maps in these cases. This still leaves us open for crashes in the network process. 1421714 1 koivisto 2018-05-08 07:15:18 -0700 <rdar://problem/34001688> 1421720 2 339820 koivisto 2018-05-08 07:33:13 -0700 Created attachment 339820 patch 1421737 3 339820 commit-queue 2018-05-08 09:15:25 -0700 Comment on attachment 339820 patch Clearing flags on attachment: 339820 Committed r231484: <https://trac.webkit.org/changeset/231484> 1421738 4 commit-queue 2018-05-08 09:15:26 -0700 All reviewed patches have been landed. Closing bug. 339820 2018-05-08 07:33:13 -0700 2018-05-08 09:15:25 -0700 patch cache-no-blob-class-a.patch text/plain 9897 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzE0ODMpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ0IEBACisyMDE4LTA1LTA4ICBBbnR0aSBLb2l2 aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBEb24ndCB1c2UgbWFwcGVkIGNhY2hl IGZpbGVzIGluIGNhc2Ugb2YgQ2xhc3MgQS9CIHByb3RlY3RlZCBhcHAKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NTQyMgorICAgICAgICA8cmRhcjov L3Byb2JsZW0vMzQwMDE2ODg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQ3VycmVudGx5IHdlIGRvbid0IHVzZSBzaGFyZWQgbWVtb3J5IG1hcHMgaW4g dGhlc2UgY2FzZXMuIFRoaXMgc3RpbGwgbGVhdmVzIHVzIG9wZW4gZm9yIGNyYXNoZXMKKyAgICAg ICAgaW4gdGhlIG5ldHdvcmsgcHJvY2VzcyB3aGVuIHRoZSBkZXZpY2UgaXMgbG9ja2VkLgorCisg ICAgICAgIFRoaXMgcGF0Y2ggZGlzYWJsZXMgdXNlIG9mIGJsb2Igc3RvcmFnZSAobWFwcGVkIGNh Y2hlIGZpbGVzKSBpbiBhcHBzIHRoYXQgdXNlIGNsYXNzIEEvQiBwcm90ZWN0aW9uLgorICAgICAg ICBOb3JtYWxseSB3ZSB1c2UgYmxvYnMgZm9yIHJlc291cmNlcyA+IDE2S0IuIFNpbmNlIHVzZSBv ZiBzaGFyZWQgbWVtb3J5IGlzIGFscmVhZHkgZGlzYWJsZWQsCisgICAgICAgIHRoZSBvbmx5IG9w dGltaXphdGlvbiBsb3N0IGZvciB0aGVzZSBhcHBzIGlzIGJvZHkgZGF0YSBkZWR1cGxpY2F0aW9u LgorCisgICAgICAgIEFueSBleGlzdGluZyBjYWNoZSBlbnRyaWVzIHdpdGggYmxvYnMgYXJlIGln bm9yZWQgYW5kIGRlbGV0ZWQuIE5ldyBlbnRyaWVzIGFyZSBjcmVhdGVkIHdpdGgKKyAgICAgICAg Ym9keSBkYXRhIGlubGluZWQgd2l0aCB0aGUgbWV0YWRhdGEuCisKKyAgICAgICAgKiBOZXR3b3Jr UHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3Jr Q2FjaGU6OkNhY2hlOjpzdG9yZSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0 d29ya0NhY2hlLmg6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6Q2FjaGU6OmNhblVz ZVNoYXJlZE1lbW9yeUZvckJvZHlEYXRhIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBOZXR3 b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVFbnRyeS5jcHA6CisgICAgICAgIChXZWJLaXQ6 Ok5ldHdvcmtDYWNoZTo6RW50cnk6OmluaXRpYWxpemVTaGFyZWFibGVSZXNvdXJjZUhhbmRsZUZy b21TdG9yYWdlUmVjb3JkIGNvbnN0KToKKworICAgICAgICAgICAgUmVtb3ZlIHRoZSBjb2RlIHRo ZSBwcmV2ZW50ZWQgdXNlIG9mIHNoYXJlZCBtZW1vcnkgaW4gdGhlc2UgY2FzZXMuIE5vbi1tYXBw ZWQgRGF0YSBvYmplY3RzCisgICAgICAgICAgICBhcmUgbmV2ZXIgc2hhcmVhYmxlLgorCisgICAg ICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6RW50cnk6OnNldE5lZWRzVmFsaWRhdGlvbik6Cisg ICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlRmlsZVN5c3RlbS5jcHA6 CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6aXNTYWZlVG9Vc2VNZW1vcnlNYXBGb3JQ YXRoKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpjYW5Vc2VTaGFyZWRNZW1vcnlG b3JQYXRoKTogRGVsZXRlZC4KKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3Jr Q2FjaGVGaWxlU3lzdGVtLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29y a0NhY2hlU3RvcmFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6U3RvcmFn ZTo6U3RvcmFnZSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6U3RvcmFnZTo6bWF5 Q29udGFpbkJsb2IgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OlN0b3Jh Z2U6OnNob3VsZFN0b3JlQm9keUFzQmxvYik6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNo ZTo6c2hvdWxkU3RvcmVCb2R5QXNCbG9iKTogRGVsZXRlZC4KKyAgICAgICAgKiBOZXR3b3JrUHJv Y2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmg6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdv cmtDYWNoZTo6U3RvcmFnZTo6Y2FuVXNlU2hhcmVkTWVtb3J5Rm9yQm9keURhdGEgY29uc3QpOiBE ZWxldGVkLgorCiAyMDE4LTA1LTA3ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdh bGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBBZGQgbWlzc2luZyBleGl0IG5vdCBpbmNs dWRlZCBpbiByMjMxMjk4LgpJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNo ZS9OZXR3b3JrQ2FjaGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcAkocmV2aXNpb24gMjMxNDM4KQorKysgU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC00MjcsMTUgKzQyNywxMyBAQCBzdGQ6OnVuaXF1ZV9wdHI8RW50cnk+IENhY2hlOjpz dG9yZShjb25zCiAgICAgYXV0byBjYWNoZUVudHJ5ID0gbWFrZUVudHJ5KHJlcXVlc3QsIHJlc3Bv bnNlLCBXVEZNb3ZlKHJlc3BvbnNlRGF0YSkpOwogICAgIGF1dG8gcmVjb3JkID0gY2FjaGVFbnRy eS0+ZW5jb2RlQXNTdG9yYWdlUmVjb3JkKCk7CiAKLSAgICBtX3N0b3JhZ2UtPnN0b3JlKHJlY29y ZCwgW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgY29tcGxldGlvbkhhbmRs ZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oY29uc3QgRGF0YSYgYm9keURhdGEpIHsK KyAgICBtX3N0b3JhZ2UtPnN0b3JlKHJlY29yZCwgW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0 aGlzKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oY29u c3QgRGF0YSYgYm9keURhdGEpIHsKICAgICAgICAgTWFwcGVkQm9keSBtYXBwZWRCb2R5OwogI2lm IEVOQUJMRShTSEFSRUFCTEVfUkVTT1VSQ0UpCi0gICAgICAgIGlmIChjYW5Vc2VTaGFyZWRNZW1v cnlGb3JCb2R5RGF0YSgpKSB7Ci0gICAgICAgICAgICBpZiAoYXV0byBzaGFyZWRNZW1vcnkgPSBi b2R5RGF0YS50cnlDcmVhdGVTaGFyZWRNZW1vcnkoKSkgewotICAgICAgICAgICAgICAgIG1hcHBl ZEJvZHkuc2hhcmVhYmxlUmVzb3VyY2UgPSBTaGFyZWFibGVSZXNvdXJjZTo6Y3JlYXRlKHNoYXJl ZE1lbW9yeS5yZWxlYXNlTm9uTnVsbCgpLCAwLCBib2R5RGF0YS5zaXplKCkpOwotICAgICAgICAg ICAgICAgIEFTU0VSVChtYXBwZWRCb2R5LnNoYXJlYWJsZVJlc291cmNlKTsKLSAgICAgICAgICAg ICAgICBtYXBwZWRCb2R5LnNoYXJlYWJsZVJlc291cmNlLT5jcmVhdGVIYW5kbGUobWFwcGVkQm9k eS5zaGFyZWFibGVSZXNvdXJjZUhhbmRsZSk7Ci0gICAgICAgICAgICB9CisgICAgICAgIGlmIChh dXRvIHNoYXJlZE1lbW9yeSA9IGJvZHlEYXRhLnRyeUNyZWF0ZVNoYXJlZE1lbW9yeSgpKSB7Cisg ICAgICAgICAgICBtYXBwZWRCb2R5LnNoYXJlYWJsZVJlc291cmNlID0gU2hhcmVhYmxlUmVzb3Vy Y2U6OmNyZWF0ZShzaGFyZWRNZW1vcnkucmVsZWFzZU5vbk51bGwoKSwgMCwgYm9keURhdGEuc2l6 ZSgpKTsKKyAgICAgICAgICAgIEFTU0VSVChtYXBwZWRCb2R5LnNoYXJlYWJsZVJlc291cmNlKTsK KyAgICAgICAgICAgIG1hcHBlZEJvZHkuc2hhcmVhYmxlUmVzb3VyY2UtPmNyZWF0ZUhhbmRsZSht YXBwZWRCb2R5LnNoYXJlYWJsZVJlc291cmNlSGFuZGxlKTsKICAgICAgICAgfQogI2VuZGlmCiAg ICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKG1hcHBlZEJvZHkpOwpJbmRleDogU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5oCShyZXZpc2lvbiAy MzE0MzgpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNo ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjgsNyArMTI4LDYgQEAgcHVibGljOgogICAgIHZvaWQg ZHVtcENvbnRlbnRzVG9GaWxlKCk7CiAKICAgICBTdHJpbmcgcmVjb3Jkc1BhdGgoKSBjb25zdDsK LSAgICBib29sIGNhblVzZVNoYXJlZE1lbW9yeUZvckJvZHlEYXRhKCkgY29uc3QgeyByZXR1cm4g bV9zdG9yYWdlLT5jYW5Vc2VTaGFyZWRNZW1vcnlGb3JCb2R5RGF0YSgpOyB9CiAKICNpZiBFTkFC TEUoTkVUV09SS19DQUNIRV9TUEVDVUxBVElWRV9SRVZBTElEQVRJT04pCiAgICAgU3BlY3VsYXRp dmVMb2FkTWFuYWdlciogc3BlY3VsYXRpdmVMb2FkTWFuYWdlcigpIHsgcmV0dXJuIG1fc3BlY3Vs YXRpdmVMb2FkTWFuYWdlci5nZXQoKTsgfQpJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVFbnRyeS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVFbnRyeS5jcHAJKHJldmlzaW9u IDIzMTQzOCkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0Nh Y2hlRW50cnkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDYsNyArMTQ2LDcgQEAgc3RkOjp1bmlx dWVfcHRyPEVudHJ5PiBFbnRyeTo6ZGVjb2RlU3Rvcgogdm9pZCBFbnRyeTo6aW5pdGlhbGl6ZVNo YXJlYWJsZVJlc291cmNlSGFuZGxlRnJvbVN0b3JhZ2VSZWNvcmQoKSBjb25zdAogewogICAgIGF1 dG8qIGNhY2hlID0gTmV0d29ya1Byb2Nlc3M6OnNpbmdsZXRvbigpLmNhY2hlKCk7Ci0gICAgaWYg KCFjYWNoZSB8fCAhY2FjaGUtPmNhblVzZVNoYXJlZE1lbW9yeUZvckJvZHlEYXRhKCkpCisgICAg aWYgKCFjYWNoZSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byBzaGFyZWRNZW1vcnkgPSBt X3NvdXJjZVN0b3JhZ2VSZWNvcmQuYm9keS50cnlDcmVhdGVTaGFyZWRNZW1vcnkoKTsKQEAgLTE5 NSwxMyArMTk1LDYgQEAgYm9vbCBFbnRyeTo6bmVlZHNWYWxpZGF0aW9uKCkgY29uc3QKIAogdm9p ZCBFbnRyeTo6c2V0TmVlZHNWYWxpZGF0aW9uKGJvb2wgdmFsdWUpCiB7Ci0gICAgaWYgKHZhbHVl KSB7Ci0gICAgICAgIC8vIFZhbGlkYXRpb24ga2VlcHMgdGhlIGVudHJ5IGFsaXZlIHdhaXRpbmcg Zm9yIHRoZSBuZXR3b3JrIHJlc3BvbnNlLiBQdWxsIGRhdGEgZnJvbSBhIG1hcHBlZCBmaWxlIGlu dG8gYSBidWZmZXIgZWFybHkKLSAgICAgICAgLy8gdG8gcHJvdGVjdCBhZ2FpbnN0IG1hcCBkaXNh cHBlYXJpbmcgZHVlIHRvIGRldmljZSBiZWNvbWluZyBsb2NrZWQuCi0gICAgICAgIC8vIEZJWE1F OiBDYWNoZSBmaWxlcyBzaG91bGQgYmUgQ2xhc3MgQi9DLCBvciB3ZSBzaG91ZG4ndCB1c2UgbWFw cGVkIGZpbGVzIGF0IGFsbCBpbiB0aGVzZSBjYXNlcy4KLSAgICAgICAgaWYgKCFOZXR3b3JrUHJv Y2Vzczo6c2luZ2xldG9uKCkuY2FjaGUoKS0+Y2FuVXNlU2hhcmVkTWVtb3J5Rm9yQm9keURhdGEo KSkKLSAgICAgICAgICAgIGJ1ZmZlcigpOwotICAgIH0KICAgICBtX3Jlc3BvbnNlLnNldFNvdXJj ZSh2YWx1ZSA/IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6OlNvdXJjZTo6RGlza0NhY2hlQWZ0 ZXJWYWxpZGF0aW9uIDogV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZTo6U291cmNlOjpEaXNrQ2Fj aGUpOwogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdv cmtDYWNoZUZpbGVTeXN0ZW0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlRmlsZVN5c3RlbS5jcHAJKHJldmlzaW9uIDIzMTQz OCkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlRmls ZVN5c3RlbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0Niw3ICsxNDYsNyBAQCB2b2lkIHVwZGF0 ZUZpbGVNb2RpZmljYXRpb25UaW1lSWZOZWVkZWQoCiAjZW5kaWYKIH0KIAotYm9vbCBjYW5Vc2VT aGFyZWRNZW1vcnlGb3JQYXRoKGNvbnN0IFN0cmluZyYgcGF0aCkKK2Jvb2wgaXNTYWZlVG9Vc2VN ZW1vcnlNYXBGb3JQYXRoKGNvbnN0IFN0cmluZyYgcGF0aCkKIHsKICNpZiBQTEFURk9STShJT1Mp ICYmICFQTEFURk9STShJT1NfU0lNVUxBVE9SKQogICAgIHN0cnVjdCB7CkluZGV4OiBTb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZUZpbGVTeXN0ZW0uaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNo ZUZpbGVTeXN0ZW0uaAkocmV2aXNpb24gMjMxNDM4KQorKysgU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVGaWxlU3lzdGVtLmgJKHdvcmtpbmcgY29weSkKQEAg LTQyLDcgKzQyLDcgQEAgc3RydWN0IEZpbGVUaW1lcyB7CiBGaWxlVGltZXMgZmlsZVRpbWVzKGNv bnN0IFN0cmluZyYgcGF0aCk7CiB2b2lkIHVwZGF0ZUZpbGVNb2RpZmljYXRpb25UaW1lSWZOZWVk ZWQoY29uc3QgU3RyaW5nJiBwYXRoKTsKIAotYm9vbCBjYW5Vc2VTaGFyZWRNZW1vcnlGb3JQYXRo KGNvbnN0IFN0cmluZyYgcGF0aCk7Citib29sIGlzU2FmZVRvVXNlTWVtb3J5TWFwRm9yUGF0aChj b25zdCBTdHJpbmcmIHBhdGgpOwogCiB9CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZS5jcHAJKHJl dmlzaW9uIDIzMTQzOCkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0 d29ya0NhY2hlU3RvcmFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxOSw3ICsyMTksNyBAQCBT dG9yYWdlOjpTdG9yYWdlKGNvbnN0IFN0cmluZyYgYmFzZURpcmVjCiAgICAgLCBtX3JlY29yZHNQ YXRoKG1ha2VSZWNvcmRzRGlyZWN0b3J5UGF0aChiYXNlRGlyZWN0b3J5UGF0aCkpCiAgICAgLCBt X21vZGUobW9kZSkKICAgICAsIG1fc2FsdChzYWx0KQotICAgICwgbV9jYW5Vc2VTaGFyZWRNZW1v cnlGb3JCb2R5RGF0YShjYW5Vc2VTaGFyZWRNZW1vcnlGb3JQYXRoKGJhc2VEaXJlY3RvcnlQYXRo KSkKKyAgICAsIG1fY2FuVXNlQmxvYnNGb3JGb3JCb2R5RGF0YShpc1NhZmVUb1VzZU1lbW9yeU1h cEZvclBhdGgoYmFzZURpcmVjdG9yeVBhdGgpKQogICAgICwgbV9yZWFkT3BlcmF0aW9uVGltZW91 dFRpbWVyKCp0aGlzLCAmU3RvcmFnZTo6Y2FuY2VsQWxsUmVhZE9wZXJhdGlvbnMpCiAgICAgLCBt X3dyaXRlT3BlcmF0aW9uRGlzcGF0Y2hUaW1lcigqdGhpcywgJlN0b3JhZ2U6OmRpc3BhdGNoUGVu ZGluZ1dyaXRlT3BlcmF0aW9ucykKICAgICAsIG1faW9RdWV1ZShXb3JrUXVldWU6OmNyZWF0ZSgi Y29tLmFwcGxlLldlYktpdC5DYWNoZS5TdG9yYWdlIiwgV29ya1F1ZXVlOjpUeXBlOjpDb25jdXJy ZW50KSkKQEAgLTM0OCw2ICszNDgsOCBAQCBib29sIFN0b3JhZ2U6Om1heUNvbnRhaW4oY29uc3Qg S2V5JiBrZXkpCiBib29sIFN0b3JhZ2U6Om1heUNvbnRhaW5CbG9iKGNvbnN0IEtleSYga2V5KSBj b25zdAogewogICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CisgICAgaWYgKCFtX2NhblVz ZUJsb2JzRm9yRm9yQm9keURhdGEpCisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICByZXR1cm4g IW1fYmxvYkZpbHRlciB8fCBtX2Jsb2JGaWx0ZXItPm1heUNvbnRhaW4oa2V5Lmhhc2goKSk7CiB9 CiAKQEAgLTc1MCw4ICs3NTIsMTAgQEAgdm9pZCBTdG9yYWdlOjpkaXNwYXRjaFBlbmRpbmdXcml0 ZU9wZXJhdAogICAgIH0KIH0KIAotc3RhdGljIGJvb2wgc2hvdWxkU3RvcmVCb2R5QXNCbG9iKGNv bnN0IERhdGEmIGJvZHlEYXRhKQorYm9vbCBTdG9yYWdlOjpzaG91bGRTdG9yZUJvZHlBc0Jsb2Io Y29uc3QgRGF0YSYgYm9keURhdGEpCiB7CisgICAgaWYgKCFtX2NhblVzZUJsb2JzRm9yRm9yQm9k eURhdGEpCisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBjb25zdCBzaXplX3QgbWF4aW11bUlu bGluZUJvZHlTaXplIHsgMTYgKiAxMDI0IH07CiAgICAgcmV0dXJuIGJvZHlEYXRhLnNpemUoKSA+ IG1heGltdW1JbmxpbmVCb2R5U2l6ZTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZS5oCShyZXZpc2lv biAyMzE0MzgpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtD YWNoZVN0b3JhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtMTAxLDggKzEwMSw2IEBAIHB1YmxpYzoK IAogICAgIGNvbnN0IFNhbHQmIHNhbHQoKSBjb25zdCB7IHJldHVybiBtX3NhbHQ7IH0KIAotICAg IGJvb2wgY2FuVXNlU2hhcmVkTWVtb3J5Rm9yQm9keURhdGEoKSBjb25zdCB7IHJldHVybiBtX2Nh blVzZVNoYXJlZE1lbW9yeUZvckJvZHlEYXRhOyB9Ci0KICAgICB+U3RvcmFnZSgpOwogCiAgICAg dm9pZCB3cml0ZVdpdGhvdXRXYWl0aW5nKCkgeyBtX2luaXRpYWxXcml0ZURlbGF5ID0gMF9zOyB9 OwpAQCAtMTMwLDYgKzEyOCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkaXNwYXRjaFBlbmRpbmdX cml0ZU9wZXJhdGlvbnMoKTsKICAgICB2b2lkIGZpbmlzaFdyaXRlT3BlcmF0aW9uKFdyaXRlT3Bl cmF0aW9uJik7CiAKKyAgICBib29sIHNob3VsZFN0b3JlQm9keUFzQmxvYihjb25zdCBEYXRhJiBi b2R5RGF0YSk7CiAgICAgc3RkOjpvcHRpb25hbDxCbG9iU3RvcmFnZTo6QmxvYj4gc3RvcmVCb2R5 QXNCbG9iKFdyaXRlT3BlcmF0aW9uJik7CiAgICAgRGF0YSBlbmNvZGVSZWNvcmQoY29uc3QgUmVj b3JkJiwgc3RkOjpvcHRpb25hbDxCbG9iU3RvcmFnZTo6QmxvYj4pOwogICAgIHZvaWQgcmVhZFJl Y29yZChSZWFkT3BlcmF0aW9uJiwgY29uc3QgRGF0YSYpOwpAQCAtMTUyLDcgKzE1MSw3IEBAIHBy aXZhdGU6CiAgICAgCiAgICAgY29uc3QgTW9kZSBtX21vZGU7CiAgICAgY29uc3QgU2FsdCBtX3Nh bHQ7Ci0gICAgY29uc3QgYm9vbCBtX2NhblVzZVNoYXJlZE1lbW9yeUZvckJvZHlEYXRhOworICAg IGNvbnN0IGJvb2wgbV9jYW5Vc2VCbG9ic0ZvckZvckJvZHlEYXRhOwogCiAgICAgc2l6ZV90IG1f Y2FwYWNpdHkgeyBzdGQ6Om51bWVyaWNfbGltaXRzPHNpemVfdD46Om1heCgpIH07CiAgICAgc2l6 ZV90IG1fYXBwcm94aW1hdGVSZWNvcmRzU2l6ZSB7IDAgfTsK