182977 2018-02-20 09:57:40 -0800 [iOS] Returning from Auto-PiP causes Safari to be unresponsive 2018-02-20 10:29:09 -0800 1 1 1 Unclassified WebKit Media Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue jer.noble webkit-bug-importer oldest_to_newest 1400798 0 eric.carlson 2018-02-20 09:57:40 -0800 The error handling added in r228115 can cause Safari to be unresponsive when returning from Auto-PiP. 1400802 1 eric.carlson 2018-02-20 09:58:46 -0800 <rdar://problem/37685981> 1400809 2 334281 eric.carlson 2018-02-20 10:09:18 -0800 Created attachment 334281 Patch 1400826 3 334281 commit-queue 2018-02-20 10:29:08 -0800 Comment on attachment 334281 Patch Clearing flags on attachment: 334281 Committed r228824: <https://trac.webkit.org/changeset/228824> 1400827 4 commit-queue 2018-02-20 10:29:09 -0800 All reviewed patches have been landed. Closing bug. 334281 2018-02-20 10:09:18 -0800 2018-02-20 10:29:08 -0800 Patch bug-182977-20180220100918.patch text/plain 8828 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4ODIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDU1ZWNkOThiMDZhM2Nm ZjVmYmUyOThmOTBlMTljMDk3OWU0OGEzYi4uNjJkNWI4MjdkZjBiZDk4MTM2ODA5ZGM2NGY5ODE0 YTk0OTQ2ZDI1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE4LTAyLTIwICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIFJldHVy bmluZyBmcm9tIEF1dG8tUGlQIGNhdXNlcyBTYWZhcmkgdG8gYmUgdW5yZXNwb25zaXZlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODI5NzcKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzM3Njg1OTgxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSB0aGUgZXJyb3IgaGFuZGxpbmcgYWRkZWQgaW4g cjIyODExNSwgaXQgYnJlYWtzIGF1dG8tcGlwLgorCisgICAgICAgICogcGxhdGZvcm0vaW9zL1Zp ZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tOgorICAgICAgICAoVmlkZW9GdWxsc2NyZWVu SW50ZXJmYWNlQVZLaXQ6OmFwcGxpY2F0aW9uRGlkQmVjb21lQWN0aXZlKToKKyAgICAgICAgKFZp ZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjplbnRlckZ1bGxzY3JlZW5TdGFuZGFyZCk6Cisg ICAgICAgIChWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZXhpdEZ1bGxzY3JlZW4pOgor ICAgICAgICAoVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmNsZWFudXBGdWxsc2NyZWVu KToKKyAgICAgICAgKFZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpkaWRTdGFydFBpY3R1 cmVJblBpY3R1cmUpOgorICAgICAgICAoVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnBy ZXBhcmVGb3JQaWN0dXJlSW5QaWN0dXJlU3RvcFdpdGhDb21wbGV0aW9uSGFuZGxlcik6CisgICAg ICAgIChWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZXhpdEZ1bGxzY3JlZW5IYW5kbGVy KToKKyAgICAgICAgKFZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjplbnRlckZ1bGxzY3Jl ZW5IYW5kbGVyKToKKwogMjAxOC0wMi0yMCAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxp YS5jb20+CiAKICAgICAgICAgW0NhaXJvXSBEcm9wIHRhcmdldCBHcmFwaGljc0NvbnRleHQgdXNh Z2UgaW4gQ2Fpcm8gb3BlcmF0aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vaW9zL1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vaW9zL1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCmluZGV4IDdmY2Vj ODIyN2U2YTQ0NDlmNmFiYWY1MmNmNmNlZWNkODliZmY4MzEuLmRmYjA2OTVlMmE4NWExMWFkMTU1 YTQzNzYwOTljNjQwM2IwNTQ3NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbQorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9pb3MvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KQEAgLTU5Miwx MCArNTkyLDggQEAgdm9pZCBWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6YXBwbGljYXRp b25EaWRCZWNvbWVBY3RpdmUoKQogICAgIGlmIChtX2N1cnJlbnRNb2RlLmhhc0Z1bGxzY3JlZW4o KSAmJiBtX2N1cnJlbnRNb2RlLmhhc1BpY3R1cmVJblBpY3R1cmUoKSkgewogICAgICAgICBbW21f cGxheWVyVmlld0NvbnRyb2xsZXIgdmlld10gbGF5b3V0SWZOZWVkZWRdOwogICAgICAgICBbbV9w bGF5ZXJWaWV3Q29udHJvbGxlciBleGl0RnVsbFNjcmVlbkFuaW1hdGVkOk5PIGNvbXBsZXRpb25I YW5kbGVyOltwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZlB0cih0aGlzKSwgdGhpc10gKEJPT0wgc3Vj Y2VzcywgTlNFcnJvciogZXJyb3IpIHsKLSAgICAgICAgICAgIGlmICghc3VjY2VzcykgeworICAg ICAgICAgICAgaWYgKCFzdWNjZXNzKQogICAgICAgICAgICAgICAgIFdURkxvZ0Fsd2F5cygiLVtB VlBsYXllclZpZXdDb250cm9sbGVyIGV4aXRGdWxsU2NyZWVuQW5pbWF0ZWQ6Y29tcGxldGlvbkhh bmRsZXI6XSBmYWlsZWQgd2l0aCBlcnJvciAlcyIsIFtbZXJyb3IgbG9jYWxpemVkRGVzY3JpcHRp b25dIFVURjhTdHJpbmddKTsKLSAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK LSAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgW21fd2luZG93IHNldEhpZGRlbjpZRVNdOwog ICAgICAgICAgICAgW1ttX3BsYXllclZpZXdDb250cm9sbGVyIHZpZXddIHNldEhpZGRlbjpZRVNd OwpAQCAtNzIxLDEyICs3MTksOCBAQCB2b2lkIFZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0 OjplbnRlckZ1bGxzY3JlZW5TdGFuZGFyZCgpCiAKICAgICBbW21fcGxheWVyVmlld0NvbnRyb2xs ZXIgdmlld10gbGF5b3V0SWZOZWVkZWRdOwogICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIGVu dGVyRnVsbFNjcmVlbkFuaW1hdGVkOllFUyBjb21wbGV0aW9uSGFuZGxlcjpbdGhpcywgcHJvdGVj dGVkVGhpcyA9IG1ha2VSZWZQdHIodGhpcyldIChCT09MIHN1Y2NlZWRlZCwgTlNFcnJvciogZXJy b3IpIHsKLSAgICAgICAgaWYgKCFzdWNjZWVkZWQpIHsKKyAgICAgICAgaWYgKCFzdWNjZWVkZWQp CiAgICAgICAgICAgICBXVEZMb2dBbHdheXMoIi1bQVZQbGF5ZXJWaWV3Q29udHJvbGxlciBlbnRl ckZ1bGxTY3JlZW5BbmltYXRlZDpjb21wbGV0aW9uSGFuZGxlcjpdIGZhaWxlZCB3aXRoIGVycm9y ICVzIiwgW1tlcnJvciBsb2NhbGl6ZWREZXNjcmlwdGlvbl0gVVRGOFN0cmluZ10pOwotICAgICAg ICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgICAgICBtX3ZpZGVvRnVsbHNjcmVl bk1vZGVsLT5yZXF1ZXN0RnVsbHNjcmVlbk1vZGUoSFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRl b0Z1bGxzY3JlZW5Nb2RlTm9uZSwgWUVTKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAg fQogCiAgICAgICAgIExPRyhGdWxsc2NyZWVuLCAiVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZL aXQ6OmVudGVyRnVsbHNjcmVlblN0YW5kYXJkIC0gbGFtYmRhKCVwKSAtIHN1Y2NlZWRlZCglcyki LCB0aGlzLCBib29sU3RyaW5nKHN1Y2NlZWRlZCkpOwogICAgICAgICBbbV9wbGF5ZXJWaWV3Q29u dHJvbGxlciBzZXRTaG93c1BsYXliYWNrQ29udHJvbHM6WUVTXTsKQEAgLTc2MywxMCArNzU3LDgg QEAgdm9pZCBWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZXhpdEZ1bGxzY3JlZW4oY29u c3QgSW50UmVjdCYgZmluYWxSZWN0KQogICAgICAgICBbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciBz dG9wUGljdHVyZUluUGljdHVyZV07CiAgICAgfSBlbHNlIGlmIChtX2N1cnJlbnRNb2RlLmhhc1Bp Y3R1cmVJblBpY3R1cmUoKSAmJiBtX2N1cnJlbnRNb2RlLmhhc0Z1bGxzY3JlZW4oKSkgewogICAg ICAgICBbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciBleGl0RnVsbFNjcmVlbkFuaW1hdGVkOk5PIGNv bXBsZXRpb25IYW5kbGVyOltwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZlB0cih0aGlzKSwgdGhpc10g KEJPT0wgc3VjY2VzcywgTlNFcnJvciogZXJyb3IpIHsKLSAgICAgICAgICAgIGlmICghc3VjY2Vz cykgeworICAgICAgICAgICAgaWYgKCFzdWNjZXNzKQogICAgICAgICAgICAgICAgIFdURkxvZ0Fs d2F5cygiLVtBVlBsYXllclZpZXdDb250cm9sbGVyIGV4aXRGdWxsU2NyZWVuQW5pbWF0ZWQ6Y29t cGxldGlvbkhhbmRsZXI6XSBmYWlsZWQgd2l0aCBlcnJvciAlcyIsIFtbZXJyb3IgbG9jYWxpemVk RGVzY3JpcHRpb25dIFVURjhTdHJpbmddKTsKLSAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JF QUNIRUQoKTsKLSAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgY2xlYXJNb2RlKEhUTUxNZWRp YUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9kZVN0YW5kYXJkKTsKICAgICAgICAgICAg IFttX3dpbmRvdyBzZXRIaWRkZW46Tk9dOwpAQCAtNzc0LDkgKzc2Niw4IEBAIHZvaWQgVmlkZW9G dWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmV4aXRGdWxsc2NyZWVuKGNvbnN0IEludFJlY3QmIGZp bmFsUmVjdCkKICAgICAgICAgfV07CiAgICAgfSBlbHNlIGlmIChtX2N1cnJlbnRNb2RlLmlzRnVs bHNjcmVlbigpKSB7CiAgICAgICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIGV4aXRGdWxsU2Ny ZWVuQW5pbWF0ZWQ6WUVTIGNvbXBsZXRpb25IYW5kbGVyOltwcm90ZWN0ZWRUaGlzID0gbWFrZVJl ZlB0cih0aGlzKSwgdGhpc10gKEJPT0wgc3VjY2VzcywgTlNFcnJvciogZXJyb3IpIG11dGFibGUg ewotICAgICAgICAgICAgaWYgKCFzdWNjZXNzKSB7CisgICAgICAgICAgICBpZiAoIXN1Y2Nlc3Mp CiAgICAgICAgICAgICAgICAgV1RGTG9nQWx3YXlzKCItW0FWUGxheWVyVmlld0NvbnRyb2xsZXIg ZXhpdEZ1bGxTY3JlZW5BbmltYXRlZDpjb21wbGV0aW9uSGFuZGxlcjpdIGZhaWxlZCB3aXRoIGVy cm9yICVzIiwgW1tlcnJvciBsb2NhbGl6ZWREZXNjcmlwdGlvbl0gVVRGOFN0cmluZ10pOwotICAg ICAgICAgICAgfQogCiAgICAgICAgICAgICBtX2V4aXRDb21wbGV0ZWQgPSB0cnVlOwogCkBAIC04 MTEsOSArODAyLDggQEAgdm9pZCBWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6Y2xlYW51 cEZ1bGxzY3JlZW4oKQogICAgIGlmIChtX2N1cnJlbnRNb2RlLmhhc0Z1bGxzY3JlZW4oKSkgewog ICAgICAgICBbW21fcGxheWVyVmlld0NvbnRyb2xsZXIgdmlld10gbGF5b3V0SWZOZWVkZWRdOwog ICAgICAgICBbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciBleGl0RnVsbFNjcmVlbkFuaW1hdGVkOk5P IGNvbXBsZXRpb25IYW5kbGVyOltdIChCT09MIHN1Y2Nlc3MsIE5TRXJyb3IqIGVycm9yKSB7Ci0g ICAgICAgICAgICBpZiAoIXN1Y2Nlc3MpIHsKKyAgICAgICAgICAgIGlmICghc3VjY2VzcykKICAg ICAgICAgICAgICAgICBXVEZMb2dBbHdheXMoIi1bQVZQbGF5ZXJWaWV3Q29udHJvbGxlciBleGl0 RnVsbFNjcmVlbkFuaW1hdGVkOmNvbXBsZXRpb25IYW5kbGVyOl0gZmFpbGVkIHdpdGggZXJyb3Ig JXMiLCBbW2Vycm9yIGxvY2FsaXplZERlc2NyaXB0aW9uXSBVVEY4U3RyaW5nXSk7Ci0gICAgICAg ICAgICB9CiAgICAgICAgIH1dOwogICAgIH0KICAgICAKQEAgLTkwMiwxMCArODkyLDggQEAgdm9p ZCBWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZGlkU3RhcnRQaWN0dXJlSW5QaWN0dXJl KCkKICAgICAgICAgaWYgKCFbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciBwaWN0dXJlSW5QaWN0dXJl V2FzU3RhcnRlZFdoZW5FbnRlcmluZ0JhY2tncm91bmRdKSB7CiAgICAgICAgICAgICBbW21fcGxh eWVyVmlld0NvbnRyb2xsZXIgdmlld10gbGF5b3V0SWZOZWVkZWRdOwogICAgICAgICAgICAgW21f cGxheWVyVmlld0NvbnRyb2xsZXIgZXhpdEZ1bGxTY3JlZW5BbmltYXRlZDpZRVMgY29tcGxldGlv bkhhbmRsZXI6W3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmUHRyKHRoaXMpLCB0aGlzXSAoQk9PTCBz dWNjZXNzLCBOU0Vycm9yKiBlcnJvcikgewotICAgICAgICAgICAgICAgIGlmICghc3VjY2Vzcykg eworICAgICAgICAgICAgICAgIGlmICghc3VjY2VzcykKICAgICAgICAgICAgICAgICAgICAgV1RG TG9nQWx3YXlzKCItW0FWUGxheWVyVmlld0NvbnRyb2xsZXIgZXhpdEZ1bGxTY3JlZW5BbmltYXRl ZDpjb21wbGV0aW9uSGFuZGxlcjpdIGZhaWxlZCB3aXRoIGVycm9yICVzIiwgW1tlcnJvciBsb2Nh bGl6ZWREZXNjcmlwdGlvbl0gVVRGOFN0cmluZ10pOwotICAgICAgICAgICAgICAgICAgICBBU1NF UlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgW21f d2luZG93IHNldEhpZGRlbjpZRVNdOwogICAgICAgICAgICAgICAgIFtbbV9wbGF5ZXJWaWV3Q29u dHJvbGxlciB2aWV3XSBzZXRIaWRkZW46WUVTXTsKICAgICAgICAgICAgIH1dOwpAQCAtOTg5LDEy ICs5NzcsOCBAQCB2b2lkIFZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpwcmVwYXJlRm9y UGljdHVyZUluUGljdHVyZVN0b3BXaXRoQ29tcGxldGlvbgogCiAgICAgICAgIFtbbV9wbGF5ZXJW aWV3Q29udHJvbGxlciB2aWV3XSBsYXlvdXRJZk5lZWRlZF07CiAgICAgICAgIFttX3BsYXllclZp ZXdDb250cm9sbGVyIGVudGVyRnVsbFNjcmVlbkFuaW1hdGVkOllFUyBjb21wbGV0aW9uSGFuZGxl cjpeKEJPT0wgc3VjY2VlZGVkLCBOU0Vycm9yICplcnJvcikgewotICAgICAgICAgICAgaWYgKCFz dWNjZWVkZWQpIHsKKyAgICAgICAgICAgIGlmICghc3VjY2VlZGVkKQogICAgICAgICAgICAgICAg IFdURkxvZ0Fsd2F5cygiLVtBVlBsYXllclZpZXdDb250cm9sbGVyIGVudGVyRnVsbFNjcmVlbkFu aW1hdGVkOmNvbXBsZXRpb25IYW5kbGVyOl0gZmFpbGVkIHdpdGggZXJyb3IgJXMiLCBbW2Vycm9y IGxvY2FsaXplZERlc2NyaXB0aW9uXSBVVEY4U3RyaW5nXSk7Ci0gICAgICAgICAgICAgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgICAgICAgICAgbV92aWRlb0Z1bGxzY3JlZW5Nb2Rl bC0+cmVxdWVzdEZ1bGxzY3JlZW5Nb2RlKEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxs c2NyZWVuTW9kZU5vbmUsIFlFUyk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAg ICAgfQogCiAgICAgICAgICAgICBtX3Jlc3RvcmluZ0Z1bGxzY3JlZW5Gb3JQaWN0dXJlSW5QaWN0 dXJlU3RvcCA9IGZhbHNlOwogICAgICAgICAgICAgc2V0TW9kZShIVE1MTWVkaWFFbGVtZW50RW51 bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGVTdGFuZGFyZCk7CkBAIC0xMTEwLDEwICsxMDk0LDggQEAg dm9pZCBWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6Y2xlYW51cEZ1bGxzY3JlZW4oKQog ICAgIGlmIChtX2N1cnJlbnRNb2RlLmhhc0Z1bGxzY3JlZW4oKSkgewogICAgICAgICBbW21fcGxh eWVyVmlld0NvbnRyb2xsZXIgdmlld10gbGF5b3V0SWZOZWVkZWRdOwogICAgICAgICBbbV9wbGF5 ZXJWaWV3Q29udHJvbGxlciBleGl0RnVsbFNjcmVlbkFuaW1hdGVkOk5PIGNvbXBsZXRpb25IYW5k bGVyOltdIChCT09MIHN1Y2Nlc3MsIE5TRXJyb3IqIGVycm9yKSB7Ci0gICAgICAgICAgICBpZiAo IXN1Y2Nlc3MpIHsKKyAgICAgICAgICAgIGlmICghc3VjY2VzcykKICAgICAgICAgICAgICAgICBX VEZMb2dBbHdheXMoIi1bQVZQbGF5ZXJWaWV3Q29udHJvbGxlciBleGl0RnVsbFNjcmVlbkFuaW1h dGVkOmNvbXBsZXRpb25IYW5kbGVyOl0gZmFpbGVkIHdpdGggZXJyb3IgJXMiLCBbW2Vycm9yIGxv Y2FsaXplZERlc2NyaXB0aW9uXSBVVEY4U3RyaW5nXSk7Ci0gICAgICAgICAgICAgICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7Ci0gICAgICAgICAgICB9CiAgICAgICAgIH1dOwogICAgIH0KICAgICAK QEAgLTE1NTQsMTEgKzE1MzYsOSBAQCB2b2lkIFZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0 Ojpkb0V4aXRGdWxsc2NyZWVuKCkKIAogdm9pZCBWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktp dDo6ZXhpdEZ1bGxzY3JlZW5IYW5kbGVyKEJPT0wgc3VjY2VzcywgTlNFcnJvciogZXJyb3IpCiB7 Ci0gICAgaWYgKCFzdWNjZXNzKSB7CisgICAgaWYgKCFzdWNjZXNzKQogICAgICAgICBXVEZMb2dB bHdheXMoIi1bQVZQbGF5ZXJWaWV3Q29udHJvbGxlciBleGl0RnVsbFNjcmVlbkFuaW1hdGVkOmNv bXBsZXRpb25IYW5kbGVyOl0gZmFpbGVkIHdpdGggZXJyb3IgJXMiLCBbW2Vycm9yIGxvY2FsaXpl ZERlc2NyaXB0aW9uXSBVVEY4U3RyaW5nXSk7Ci0gICAgfQogCi0gICAgVU5VU0VEX1BBUkFNKHN1 Y2Nlc3MpOwogICAgIExPRyhGdWxsc2NyZWVuLCAiVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZL aXQ6OmRpZEV4aXRGdWxsc2NyZWVuKCVwKSAtICVkIiwgdGhpcywgc3VjY2Vzcyk7CiAKICAgICBj bGVhck1vZGUoSFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlU3RhbmRh cmQpOwpAQCAtMTU4MywxMiArMTU2Myw4IEBAIHZvaWQgVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNl QVZLaXQ6OmV4aXRGdWxsc2NyZWVuSGFuZGxlcihCT09MIHN1Y2Nlc3MsIE5TRXJyb3IqCiAKIHZv aWQgVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmVudGVyRnVsbHNjcmVlbkhhbmRsZXIo Qk9PTCBzdWNjZXNzLCBOU0Vycm9yKiBlcnJvcikKIHsKLSAgICBpZiAoIXN1Y2Nlc3MpIHsKKyAg ICBpZiAoIXN1Y2Nlc3MpCiAgICAgICAgIFdURkxvZ0Fsd2F5cygiLVtBVlBsYXllclZpZXdDb250 cm9sbGVyIGVudGVyRnVsbFNjcmVlbkFuaW1hdGVkOmNvbXBsZXRpb25IYW5kbGVyOl0gZmFpbGVk IHdpdGggZXJyb3IgJXMiLCBbW2Vycm9yIGxvY2FsaXplZERlc2NyaXB0aW9uXSBVVEY4U3RyaW5n XSk7Ci0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICBtX3ZpZGVvRnVsbHNj cmVlbk1vZGVsLT5yZXF1ZXN0RnVsbHNjcmVlbk1vZGUoSFRNTE1lZGlhRWxlbWVudEVudW1zOjpW aWRlb0Z1bGxzY3JlZW5Nb2RlTm9uZSwgWUVTKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KIAog ICAgIExPRyhGdWxsc2NyZWVuLCAiVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmVudGVy RnVsbHNjcmVlblN0YW5kYXJkIC0gbGFtYmRhKCVwKSIsIHRoaXMpOwogICAgIHNldE1vZGUoSFRN TE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlU3RhbmRhcmQpOwo=