144337 2015-04-28 10:09:55 -0700 Network Cache: Do not create a SharedBuffer for mapped resources unless explicitly requested 2015-04-28 23:16:14 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cgarcia webkit-unassigned cdumez koivisto oldest_to_newest 1089588 0 cgarcia 2015-04-28 10:09:55 -0700 We send a buffer or a memory mapped handler to the web process depending on whether the resource body is mapped or not, but we are always creating a shared buffer even for mapped resources. 1089590 1 251856 cgarcia 2015-04-28 10:16:00 -0700 Created attachment 251856 Patch 1089628 2 251865 cgarcia 2015-04-28 11:10:16 -0700 Created attachment 251865 Try to fix the build 1089901 3 cgarcia 2015-04-28 23:16:14 -0700 Committed r183531: <http://trac.webkit.org/changeset/183531> 251856 2015-04-28 10:16:00 -0700 2015-04-28 11:10:16 -0700 Patch wk2-cache-entry-mapped-resource.diff text/plain 4279 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA4NTI3YTFjLi5mZmI1ZmM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTUtMDQtMjggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIE5ldHdvcmsgQ2FjaGU6IERvIG5vdCBjcmVhdGUgYSBTaGFyZWRCdWZmZXIg Zm9yIG1hcHBlZCByZXNvdXJjZXMgdW5sZXNzIGV4cGxpY2l0bHkgcmVxdWVzdGVkCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQzMzcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBzZW5kIGEgYnVmZmVy IG9yIGEgbWVtb3J5IG1hcHBlZCBoYW5kbGVyIHRvIHRoZSB3ZWIgcHJvY2VzcworICAgICAgICBk ZXBlbmRpbmcgb24gd2hldGhlciB0aGUgcmVzb3VyY2UgYm9keSBpcyBtYXBwZWQgb3Igbm90LCBi dXQgd2UKKyAgICAgICAgYXJlIGFsd2F5cyBjcmVhdGluZyBhIHNoYXJlZCBidWZmZXIgZXZlbiBm b3IgbWFwcGVkIHJlc291cmNlcy4KKyAgICAgICAgU3BsaXQgaW5pdGlhbGl6ZUJ1ZmZlckZyb21T dG9yYWdlUmVjb3JkKCkgbW92aW5nIHRoZSBtYXBwZWQgbWVtb3J5CisgICAgICAgIGhhbmRsZXIg aW5pdGlhbGl6YXRpb24gdG8gaXRzIG93biBtZXRob2QuCisKKyAgICAgICAgKiBOZXR3b3JrUHJv Y2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVFbnRyeS5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdv cmtDYWNoZTo6RW50cnk6OmluaXRpYWxpemVTaGFyZWFibGVSZXNvdXJjZUhhbmRsZUZyb21TdG9y YWdlUmVjb3JkKToKKyAgICAgICAgSW5pdGlhbGl6ZSB0aGUgbWFwcGVkIG1lbW9yeSBoYW5kbGVy IGlmIHRoZSBib2R5IGRhdGEgaXMgbWFwcGVkLgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2Fj aGU6OkVudHJ5Ojppbml0aWFsaXplQnVmZmVyRnJvbVN0b3JhZ2VSZWNvcmQpOgorICAgICAgICBJ bml0aWFsaXplIHRoZSBidWZmZXIgYnkgd3JhcHBpbmcgdGhlIG1hcHBlZCBtZW1vcnkgaWYgdGhl IGJvZHkKKyAgICAgICAgZGF0YSBpcyBtYXBwZWQsIG9yIHVzaW5nIHRoZSBib2R5IGRhdGEgZGly ZWN0bHkgb3RoZXJ3aXNlLgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OkVudHJ5Ojpz aGFyZWFibGVSZXNvdXJjZUhhbmRsZSk6IENhbGwKKyAgICAgICAgaW5pdGlhbGl6ZVNoYXJlYWJs ZVJlc291cmNlSGFuZGxlRnJvbVN0b3JhZ2VSZWNvcmQoKSBpZiB0aGUKKyAgICAgICAgaGFuZGxl ciBpcyBudWxsLgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZUVu dHJ5Lmg6CisKIDIwMTUtMDQtMjggIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAog ICAgICAgICBbV0syXVtNYWNdIFVwZGF0ZSBXZWJDb250ZW50IHByb2Nlc3MnIHNhbmRib3ggcHJv ZmlsZSBmb3IgQVdECmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9j YWNoZS9OZXR3b3JrQ2FjaGVFbnRyeS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vz cy9jYWNoZS9OZXR3b3JrQ2FjaGVFbnRyeS5jcHAKaW5kZXggZDE0ZDg3OC4uMjU1MWQwYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hl RW50cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdv cmtDYWNoZUVudHJ5LmNwcApAQCAtMTAyLDE5ICsxMDIsMjYgQEAgc3RkOjp1bmlxdWVfcHRyPEVu dHJ5PiBFbnRyeTo6ZGVjb2RlU3RvcmFnZVJlY29yZChjb25zdCBTdG9yYWdlOjpSZWNvcmQmIHN0 b3JhZ2UKICAgICByZXR1cm4gZW50cnk7CiB9CiAKLXZvaWQgRW50cnk6OmluaXRpYWxpemVCdWZm ZXJGcm9tU3RvcmFnZVJlY29yZCgpIGNvbnN0Ci17Ci0gICAgYXV0byogZGF0YSA9IG1fc291cmNl U3RvcmFnZVJlY29yZC5ib2R5LmRhdGEoKTsKLSAgICBzaXplX3Qgc2l6ZSA9IG1fc291cmNlU3Rv cmFnZVJlY29yZC5ib2R5LnNpemUoKTsKICNpZiBFTkFCTEUoU0hBUkVBQkxFX1JFU09VUkNFKQor dm9pZCBFbnRyeTo6aW5pdGlhbGl6ZVNoYXJlYWJsZVJlc291cmNlSGFuZGxlRnJvbVN0b3JhZ2VS ZWNvcmQoKSBjb25zdAorewogICAgIFJlZlB0cjxTaGFyZWRNZW1vcnk+IHNoYXJlZE1lbW9yeSA9 IG1fc291cmNlU3RvcmFnZVJlY29yZC5ib2R5LmlzTWFwKCkgPyBTaGFyZWRNZW1vcnk6OmNyZWF0 ZShjb25zdF9jYXN0PHVpbnQ4X3QqPihkYXRhKSwgc2l6ZSwgU2hhcmVkTWVtb3J5OjpQcm90ZWN0 aW9uOjpSZWFkT25seSkgOiBudWxscHRyOwogICAgIFJlZlB0cjxTaGFyZWFibGVSZXNvdXJjZT4g c2hhcmVhYmxlUmVzb3VyY2UgPSBzaGFyZWRNZW1vcnkgPyBTaGFyZWFibGVSZXNvdXJjZTo6Y3Jl YXRlKHNoYXJlZE1lbW9yeS5yZWxlYXNlKCksIDAsIG1fc291cmNlU3RvcmFnZVJlY29yZC5ib2R5 LnNpemUoKSkgOiBudWxscHRyOworICAgIGlmIChzaGFyZWFibGVSZXNvdXJjZSkKKyAgICAgICAg c2hhcmVhYmxlUmVzb3VyY2UtPmNyZWF0ZUhhbmRsZShtX3NoYXJlYWJsZVJlc291cmNlSGFuZGxl KTsKK30KKyNlbmRpZgogCi0gICAgaWYgKHNoYXJlYWJsZVJlc291cmNlICYmIHNoYXJlYWJsZVJl c291cmNlLT5jcmVhdGVIYW5kbGUobV9zaGFyZWFibGVSZXNvdXJjZUhhbmRsZSkpCit2b2lkIEVu dHJ5Ojppbml0aWFsaXplQnVmZmVyRnJvbVN0b3JhZ2VSZWNvcmQoKSBjb25zdAoreworI2lmIEVO QUJMRShTSEFSRUFCTEVfUkVTT1VSQ0UpCisgICAgaWYgKCFzaGFyZWFibGVSZXNvdXJjZUhhbmRs ZSgpLmlzTnVsbCgpKSB7CiAgICAgICAgIG1fYnVmZmVyID0gbV9zaGFyZWFibGVSZXNvdXJjZUhh bmRsZS50cnlXcmFwSW5TaGFyZWRCdWZmZXIoKTsKKyAgICAgICAgaWYgKG1fYnVmZmVyKQorICAg ICAgICAgICAgcmV0dXJuOworICAgIH0KICNlbmRpZgotICAgIGlmICghbV9idWZmZXIpCi0gICAg ICAgIG1fYnVmZmVyID0gV2ViQ29yZTo6U2hhcmVkQnVmZmVyOjpjcmVhdGUoZGF0YSwgc2l6ZSk7 CisgICAgbV9idWZmZXIgPSBXZWJDb3JlOjpTaGFyZWRCdWZmZXI6OmNyZWF0ZShtX3NvdXJjZVN0 b3JhZ2VSZWNvcmQuYm9keS5kYXRhKCksIG1fc291cmNlU3RvcmFnZVJlY29yZC5ib2R5LnNpemUo KSk7CiB9CiAKIFdlYkNvcmU6OlNoYXJlZEJ1ZmZlciogRW50cnk6OmJ1ZmZlcigpIGNvbnN0CkBA IC0xMjgsOCArMTM1LDggQEAgV2ViQ29yZTo6U2hhcmVkQnVmZmVyKiBFbnRyeTo6YnVmZmVyKCkg Y29uc3QKICNpZiBFTkFCTEUoU0hBUkVBQkxFX1JFU09VUkNFKQogU2hhcmVhYmxlUmVzb3VyY2U6 OkhhbmRsZSYgRW50cnk6OnNoYXJlYWJsZVJlc291cmNlSGFuZGxlKCkgY29uc3QKIHsKLSAgICBp ZiAoIW1fYnVmZmVyKQotICAgICAgICBpbml0aWFsaXplQnVmZmVyRnJvbVN0b3JhZ2VSZWNvcmQo KTsKKyAgICBpZiAobV9zaGFyZWFibGVSZXNvdXJjZUhhbmRsZS5pc051bGwoKSkKKyAgICAgICAg aW5pdGlhbGl6ZVNoYXJlYWJsZVJlc291cmNlSGFuZGxlRnJvbVN0b3JhZ2VSZWNvcmQoKTsKIAog ICAgIHJldHVybiBtX3NoYXJlYWJsZVJlc291cmNlSGFuZGxlOwogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlRW50cnkuaCBiL1Nv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZUVudHJ5LmgKaW5k ZXggYWZiYzljOS4uZWZhNWU2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1By b2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlRW50cnkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3 b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVFbnRyeS5oCkBAIC03MCw2ICs3MCw5IEBAIHB1 YmxpYzoKIHByaXZhdGU6CiAgICAgRW50cnkoY29uc3QgU3RvcmFnZTo6UmVjb3JkJik7CiAgICAg dm9pZCBpbml0aWFsaXplQnVmZmVyRnJvbVN0b3JhZ2VSZWNvcmQoKSBjb25zdDsKKyNpZiBFTkFC TEUoU0hBUkVBQkxFX1JFU09VUkNFKQorICAgIHZvaWQgaW5pdGlhbGl6ZVNoYXJlYWJsZVJlc291 cmNlSGFuZGxlRnJvbVN0b3JhZ2VSZWNvcmQoKSBjb25zdDsKKyNlbmRpZgogCiAgICAgS2V5IG1f a2V5OwogICAgIHN0ZDo6Y2hyb25vOjpzeXN0ZW1fY2xvY2s6OnRpbWVfcG9pbnQgbV90aW1lU3Rh bXA7Cg== 251865 2015-04-28 11:10:16 -0700 2015-04-28 12:57:11 -0700 Try to fix the build wk2-cache-entry-mapped-resource.diff text/plain 4444 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA4NTI3YTFjLi5mZmI1ZmM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTUtMDQtMjggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIE5ldHdvcmsgQ2FjaGU6IERvIG5vdCBjcmVhdGUgYSBTaGFyZWRCdWZmZXIg Zm9yIG1hcHBlZCByZXNvdXJjZXMgdW5sZXNzIGV4cGxpY2l0bHkgcmVxdWVzdGVkCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQzMzcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBzZW5kIGEgYnVmZmVy IG9yIGEgbWVtb3J5IG1hcHBlZCBoYW5kbGVyIHRvIHRoZSB3ZWIgcHJvY2VzcworICAgICAgICBk ZXBlbmRpbmcgb24gd2hldGhlciB0aGUgcmVzb3VyY2UgYm9keSBpcyBtYXBwZWQgb3Igbm90LCBi dXQgd2UKKyAgICAgICAgYXJlIGFsd2F5cyBjcmVhdGluZyBhIHNoYXJlZCBidWZmZXIgZXZlbiBm b3IgbWFwcGVkIHJlc291cmNlcy4KKyAgICAgICAgU3BsaXQgaW5pdGlhbGl6ZUJ1ZmZlckZyb21T dG9yYWdlUmVjb3JkKCkgbW92aW5nIHRoZSBtYXBwZWQgbWVtb3J5CisgICAgICAgIGhhbmRsZXIg aW5pdGlhbGl6YXRpb24gdG8gaXRzIG93biBtZXRob2QuCisKKyAgICAgICAgKiBOZXR3b3JrUHJv Y2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVFbnRyeS5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdv cmtDYWNoZTo6RW50cnk6OmluaXRpYWxpemVTaGFyZWFibGVSZXNvdXJjZUhhbmRsZUZyb21TdG9y YWdlUmVjb3JkKToKKyAgICAgICAgSW5pdGlhbGl6ZSB0aGUgbWFwcGVkIG1lbW9yeSBoYW5kbGVy IGlmIHRoZSBib2R5IGRhdGEgaXMgbWFwcGVkLgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2Fj aGU6OkVudHJ5Ojppbml0aWFsaXplQnVmZmVyRnJvbVN0b3JhZ2VSZWNvcmQpOgorICAgICAgICBJ bml0aWFsaXplIHRoZSBidWZmZXIgYnkgd3JhcHBpbmcgdGhlIG1hcHBlZCBtZW1vcnkgaWYgdGhl IGJvZHkKKyAgICAgICAgZGF0YSBpcyBtYXBwZWQsIG9yIHVzaW5nIHRoZSBib2R5IGRhdGEgZGly ZWN0bHkgb3RoZXJ3aXNlLgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OkVudHJ5Ojpz aGFyZWFibGVSZXNvdXJjZUhhbmRsZSk6IENhbGwKKyAgICAgICAgaW5pdGlhbGl6ZVNoYXJlYWJs ZVJlc291cmNlSGFuZGxlRnJvbVN0b3JhZ2VSZWNvcmQoKSBpZiB0aGUKKyAgICAgICAgaGFuZGxl ciBpcyBudWxsLgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZUVu dHJ5Lmg6CisKIDIwMTUtMDQtMjggIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAog ICAgICAgICBbV0syXVtNYWNdIFVwZGF0ZSBXZWJDb250ZW50IHByb2Nlc3MnIHNhbmRib3ggcHJv ZmlsZSBmb3IgQVdECmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9j YWNoZS9OZXR3b3JrQ2FjaGVFbnRyeS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vz cy9jYWNoZS9OZXR3b3JrQ2FjaGVFbnRyeS5jcHAKaW5kZXggZDE0ZDg3OC4uYzM0ZmM1MiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hl RW50cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdv cmtDYWNoZUVudHJ5LmNwcApAQCAtMTAyLDE5ICsxMDIsMjggQEAgc3RkOjp1bmlxdWVfcHRyPEVu dHJ5PiBFbnRyeTo6ZGVjb2RlU3RvcmFnZVJlY29yZChjb25zdCBTdG9yYWdlOjpSZWNvcmQmIHN0 b3JhZ2UKICAgICByZXR1cm4gZW50cnk7CiB9CiAKLXZvaWQgRW50cnk6OmluaXRpYWxpemVCdWZm ZXJGcm9tU3RvcmFnZVJlY29yZCgpIGNvbnN0CisjaWYgRU5BQkxFKFNIQVJFQUJMRV9SRVNPVVJD RSkKK3ZvaWQgRW50cnk6OmluaXRpYWxpemVTaGFyZWFibGVSZXNvdXJjZUhhbmRsZUZyb21TdG9y YWdlUmVjb3JkKCkgY29uc3QKIHsKICAgICBhdXRvKiBkYXRhID0gbV9zb3VyY2VTdG9yYWdlUmVj b3JkLmJvZHkuZGF0YSgpOwogICAgIHNpemVfdCBzaXplID0gbV9zb3VyY2VTdG9yYWdlUmVjb3Jk LmJvZHkuc2l6ZSgpOwotI2lmIEVOQUJMRShTSEFSRUFCTEVfUkVTT1VSQ0UpCiAgICAgUmVmUHRy PFNoYXJlZE1lbW9yeT4gc2hhcmVkTWVtb3J5ID0gbV9zb3VyY2VTdG9yYWdlUmVjb3JkLmJvZHku aXNNYXAoKSA/IFNoYXJlZE1lbW9yeTo6Y3JlYXRlKGNvbnN0X2Nhc3Q8dWludDhfdCo+KGRhdGEp LCBzaXplLCBTaGFyZWRNZW1vcnk6OlByb3RlY3Rpb246OlJlYWRPbmx5KSA6IG51bGxwdHI7Ci0g ICAgUmVmUHRyPFNoYXJlYWJsZVJlc291cmNlPiBzaGFyZWFibGVSZXNvdXJjZSA9IHNoYXJlZE1l bW9yeSA/IFNoYXJlYWJsZVJlc291cmNlOjpjcmVhdGUoc2hhcmVkTWVtb3J5LnJlbGVhc2UoKSwg MCwgbV9zb3VyY2VTdG9yYWdlUmVjb3JkLmJvZHkuc2l6ZSgpKSA6IG51bGxwdHI7CisgICAgUmVm UHRyPFNoYXJlYWJsZVJlc291cmNlPiBzaGFyZWFibGVSZXNvdXJjZSA9IHNoYXJlZE1lbW9yeSA/ IFNoYXJlYWJsZVJlc291cmNlOjpjcmVhdGUoc2hhcmVkTWVtb3J5LnJlbGVhc2UoKSwgMCwgc2l6 ZSkgOiBudWxscHRyOworICAgIGlmIChzaGFyZWFibGVSZXNvdXJjZSkKKyAgICAgICAgc2hhcmVh YmxlUmVzb3VyY2UtPmNyZWF0ZUhhbmRsZShtX3NoYXJlYWJsZVJlc291cmNlSGFuZGxlKTsKK30K KyNlbmRpZgogCi0gICAgaWYgKHNoYXJlYWJsZVJlc291cmNlICYmIHNoYXJlYWJsZVJlc291cmNl LT5jcmVhdGVIYW5kbGUobV9zaGFyZWFibGVSZXNvdXJjZUhhbmRsZSkpCit2b2lkIEVudHJ5Ojpp bml0aWFsaXplQnVmZmVyRnJvbVN0b3JhZ2VSZWNvcmQoKSBjb25zdAoreworI2lmIEVOQUJMRShT SEFSRUFCTEVfUkVTT1VSQ0UpCisgICAgaWYgKCFzaGFyZWFibGVSZXNvdXJjZUhhbmRsZSgpLmlz TnVsbCgpKSB7CiAgICAgICAgIG1fYnVmZmVyID0gbV9zaGFyZWFibGVSZXNvdXJjZUhhbmRsZS50 cnlXcmFwSW5TaGFyZWRCdWZmZXIoKTsKKyAgICAgICAgaWYgKG1fYnVmZmVyKQorICAgICAgICAg ICAgcmV0dXJuOworICAgIH0KICNlbmRpZgotICAgIGlmICghbV9idWZmZXIpCi0gICAgICAgIG1f YnVmZmVyID0gV2ViQ29yZTo6U2hhcmVkQnVmZmVyOjpjcmVhdGUoZGF0YSwgc2l6ZSk7CisgICAg bV9idWZmZXIgPSBXZWJDb3JlOjpTaGFyZWRCdWZmZXI6OmNyZWF0ZShtX3NvdXJjZVN0b3JhZ2VS ZWNvcmQuYm9keS5kYXRhKCksIG1fc291cmNlU3RvcmFnZVJlY29yZC5ib2R5LnNpemUoKSk7CiB9 CiAKIFdlYkNvcmU6OlNoYXJlZEJ1ZmZlciogRW50cnk6OmJ1ZmZlcigpIGNvbnN0CkBAIC0xMjgs OCArMTM3LDggQEAgV2ViQ29yZTo6U2hhcmVkQnVmZmVyKiBFbnRyeTo6YnVmZmVyKCkgY29uc3QK ICNpZiBFTkFCTEUoU0hBUkVBQkxFX1JFU09VUkNFKQogU2hhcmVhYmxlUmVzb3VyY2U6OkhhbmRs ZSYgRW50cnk6OnNoYXJlYWJsZVJlc291cmNlSGFuZGxlKCkgY29uc3QKIHsKLSAgICBpZiAoIW1f YnVmZmVyKQotICAgICAgICBpbml0aWFsaXplQnVmZmVyRnJvbVN0b3JhZ2VSZWNvcmQoKTsKKyAg ICBpZiAobV9zaGFyZWFibGVSZXNvdXJjZUhhbmRsZS5pc051bGwoKSkKKyAgICAgICAgaW5pdGlh bGl6ZVNoYXJlYWJsZVJlc291cmNlSGFuZGxlRnJvbVN0b3JhZ2VSZWNvcmQoKTsKIAogICAgIHJl dHVybiBtX3NoYXJlYWJsZVJlc291cmNlSGFuZGxlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlRW50cnkuaCBiL1NvdXJjZS9X ZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZUVudHJ5LmgKaW5kZXggYWZi YzljOS4uZWZhNWU2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3Mv Y2FjaGUvTmV0d29ya0NhY2hlRW50cnkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJv Y2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVFbnRyeS5oCkBAIC03MCw2ICs3MCw5IEBAIHB1YmxpYzoK IHByaXZhdGU6CiAgICAgRW50cnkoY29uc3QgU3RvcmFnZTo6UmVjb3JkJik7CiAgICAgdm9pZCBp bml0aWFsaXplQnVmZmVyRnJvbVN0b3JhZ2VSZWNvcmQoKSBjb25zdDsKKyNpZiBFTkFCTEUoU0hB UkVBQkxFX1JFU09VUkNFKQorICAgIHZvaWQgaW5pdGlhbGl6ZVNoYXJlYWJsZVJlc291cmNlSGFu ZGxlRnJvbVN0b3JhZ2VSZWNvcmQoKSBjb25zdDsKKyNlbmRpZgogCiAgICAgS2V5IG1fa2V5Owog ICAgIHN0ZDo6Y2hyb25vOjpzeXN0ZW1fY2xvY2s6OnRpbWVfcG9pbnQgbV90aW1lU3RhbXA7Cg==