132483 2014-05-02 13:01:34 -0700 Clean up FormDataElement 2014-05-02 14:03:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca berto cdumez cgarcia commit-queue danw galpeter gustavo mrobinson oldest_to_newest 1006112 0 andersca 2014-05-02 13:01:34 -0700 Clean up FormDataElement 1006113 1 230688 andersca 2014-05-02 13:02:28 -0700 Created attachment 230688 Patch 1006139 2 andersca 2014-05-02 14:03:25 -0700 Committed r168188: <http://trac.webkit.org/changeset/168188> 230688 2014-05-02 13:02:28 -0700 2014-05-02 13:47:31 -0700 Patch bug-132483-20140502200205.patch text/plain 23470 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4MTgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTQ0MDQyZjFmYjBmN2Y3 MTg2Yzg3Mzc4MGIyMGI5YmI5OGY1M2U5ZS4uZWExNWZlMDQ4ODE4NDU5MGMxYjg2Mjk0NGQwODEz NmUyMDliZjcyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM3IEBACiAyMDE0LTA1LTAyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQ2xlYW4gdXAgRm9y bURhdGFFbGVtZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzI0ODMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHBsYXRmb3JtL25ldHdvcmsvRm9ybURhdGEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Rm9ybURhdGE6OkZvcm1EYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OkZvcm1EYXRhOjpkZWVwQ29w eSk6CisgICAgICAgIChXZWJDb3JlOjpGb3JtRGF0YTo6ZXhwYW5kRGF0YVN0b3JlKToKKyAgICAg ICAgKFdlYkNvcmU6OkZvcm1EYXRhOjpmbGF0dGVuKToKKyAgICAgICAgKFdlYkNvcmU6OkZvcm1E YXRhOjpyZXNvbHZlQmxvYlJlZmVyZW5jZXMpOgorICAgICAgICAoV2ViQ29yZTo6Rm9ybURhdGE6 OmdlbmVyYXRlRmlsZXMpOgorICAgICAgICAoV2ViQ29yZTo6Rm9ybURhdGE6Omhhc0dlbmVyYXRl ZEZpbGVzKToKKyAgICAgICAgKFdlYkNvcmU6OkZvcm1EYXRhOjpoYXNPd25lZEdlbmVyYXRlZEZp bGVzKToKKyAgICAgICAgKFdlYkNvcmU6OkZvcm1EYXRhOjpyZW1vdmVHZW5lcmF0ZWRGaWxlc0lm TmVlZGVkKToKKyAgICAgICAgKFdlYkNvcmU6OmVuY29kZUVsZW1lbnQpOgorICAgICAgICAoV2Vi Q29yZTo6ZGVjb2RlRWxlbWVudCk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9Gb3JtRGF0 YS5oOgorICAgICAgICAoV2ViQ29yZTo6Rm9ybURhdGFFbGVtZW50OjpGb3JtRGF0YUVsZW1lbnQp OgorICAgICAgICAoV2ViQ29yZTo6b3BlcmF0b3I9PSk6CisgICAgICAgICogcGxhdGZvcm0vbmV0 d29yay9jZi9Gb3JtRGF0YVN0cmVhbUNGTmV0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmFkdmFu Y2VDdXJyZW50U3RyZWFtKToKKyAgICAgICAgKFdlYkNvcmU6OnNldEhUVFBCb2R5KToKKyAgICAg ICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvRm9ybURhdGFTdHJlYW1DdXJsLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkZvcm1EYXRhU3RyZWFtOjpyZWFkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9u ZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OnNldHVwRm9ybURhdGEpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJj ZUhhbmRsZVNvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6YWRkRm9ybUVsZW1lbnRzVG9Tb3Vw TWVzc2FnZSk6CisKKzIwMTQtMDUtMDIgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxl LmNvbT4KKwogICAgICAgICBBZGQgYW5kIGltcGxlbWVudCBLZXllZERlY29kZXI6OmRlY29kZUJ5 dGVzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI0 NzkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCmluZGV4IGE1ODY2ZDIxYThiYzQ1NDM1ODA3ZTNjZWRjYzE2NDRiZDY0ZmUz NGIuLjhjMjVlYjBkYzJhYTE3MzI0YTllNDFkMmMxOTlmMGI3OTBmNDdmNmYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK QEAgLTEsNSArMSwxNyBAQAogMjAxNC0wNS0wMiAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FA YXBwbGUuY29tPgogCisgICAgICAgIENsZWFuIHVwIEZvcm1EYXRhRWxlbWVudAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyNDgzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUmVzb3Vy Y2VMb2FkZXI6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcik6CisgICAgICAgICogU2hhcmVkL05ldHdv cmsvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpO ZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVyczo6ZW5jb2RlKToKKworMjAxNC0wNS0wMiAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIEFkZCBhbmQgaW1w bGVtZW50IEtleWVkRGVjb2Rlcjo6ZGVjb2RlQnl0ZXMKICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjQ3OQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL0Zvcm1EYXRhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvRm9ybURhdGEuY3BwCmluZGV4IDVhY2U2ZWE4YjJjZDYwZTUzMDEyYmJiYzJj MDUwNjViZTFiYTczOTAuLmUxMTVhNjYwNGFlNmI5YjFiY2IyODE5NGYwNGViY2FiMzgxNjY4ZGUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRm9ybURhdGEuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRm9ybURhdGEuY3BwCkBAIC01 OSw3ICs1OSw3IEBAIGlubGluZSBGb3JtRGF0YTo6Rm9ybURhdGEoY29uc3QgRm9ybURhdGEmIGRh dGEpCiAgICAgLy8gV2Ugc2hvdWxkbid0IGJlIGNvcHlpbmcgRm9ybURhdGEgdGhhdCBoYXNuJ3Qg YWxyZWFkeSByZW1vdmVkIGl0cyBnZW5lcmF0ZWQgZmlsZXMKICAgICAvLyBidXQganVzdCBpbiBj YXNlLCBtYWtlIHN1cmUgdGhlIG5ldyBGb3JtRGF0YSBpcyByZWFkeSB0byBnZW5lcmF0ZSBpdHMg b3duIGZpbGVzLgogICAgIGZvciAoRm9ybURhdGFFbGVtZW50JiBlbGVtZW50IDogbV9lbGVtZW50 cykgewotICAgICAgICBpZiAoZWxlbWVudC5tX3R5cGUgPT0gRm9ybURhdGFFbGVtZW50OjplbmNv ZGVkRmlsZSkgeworICAgICAgICBpZiAoZWxlbWVudC5tX3R5cGUgPT0gRm9ybURhdGFFbGVtZW50 OjpUeXBlOjpFbmNvZGVkRmlsZSkgewogICAgICAgICAgICAgZWxlbWVudC5tX2dlbmVyYXRlZEZp bGVuYW1lID0gU3RyaW5nKCk7CiAgICAgICAgICAgICBlbGVtZW50Lm1fb3duc0dlbmVyYXRlZEZp bGUgPSBmYWxzZTsKICAgICAgICAgfQpAQCAtMTI4LDEwICsxMjgsMTAgQEAgUGFzc1JlZlB0cjxG b3JtRGF0YT4gRm9ybURhdGE6OmRlZXBDb3B5KCkgY29uc3QKICAgICBmb3JtRGF0YS0+bV9lbGVt ZW50cy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KG1fZWxlbWVudHMuc2l6ZSgpKTsKICAgICBmb3Ig KGNvbnN0IEZvcm1EYXRhRWxlbWVudCYgZWxlbWVudCA6IG1fZWxlbWVudHMpIHsKICAgICAgICAg c3dpdGNoIChlbGVtZW50Lm1fdHlwZSkgewotICAgICAgICBjYXNlIEZvcm1EYXRhRWxlbWVudDo6 ZGF0YToKKyAgICAgICAgY2FzZSBGb3JtRGF0YUVsZW1lbnQ6OlR5cGU6OkRhdGE6CiAgICAgICAg ICAgICBmb3JtRGF0YS0+bV9lbGVtZW50cy51bmNoZWNrZWRBcHBlbmQoRm9ybURhdGFFbGVtZW50 KGVsZW1lbnQubV9kYXRhKSk7CiAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBGb3Jt RGF0YUVsZW1lbnQ6OmVuY29kZWRGaWxlOgorICAgICAgICBjYXNlIEZvcm1EYXRhRWxlbWVudDo6 VHlwZTo6RW5jb2RlZEZpbGU6CiAjaWYgRU5BQkxFKEJMT0IpCiAgICAgICAgICAgICBmb3JtRGF0 YS0+bV9lbGVtZW50cy51bmNoZWNrZWRBcHBlbmQoRm9ybURhdGFFbGVtZW50KGVsZW1lbnQubV9m aWxlbmFtZSwgZWxlbWVudC5tX2ZpbGVTdGFydCwgZWxlbWVudC5tX2ZpbGVMZW5ndGgsIGVsZW1l bnQubV9leHBlY3RlZEZpbGVNb2RpZmljYXRpb25UaW1lLCBlbGVtZW50Lm1fc2hvdWxkR2VuZXJh dGVGaWxlKSk7CiAjZWxzZQpAQCAtMTM5LDcgKzEzOSw3IEBAIFBhc3NSZWZQdHI8Rm9ybURhdGE+ IEZvcm1EYXRhOjpkZWVwQ29weSgpIGNvbnN0CiAjZW5kaWYKICAgICAgICAgICAgIGJyZWFrOwog I2lmIEVOQUJMRShCTE9CKQotICAgICAgICBjYXNlIEZvcm1EYXRhRWxlbWVudDo6ZW5jb2RlZEJs b2I6CisgICAgICAgIGNhc2UgRm9ybURhdGFFbGVtZW50OjpUeXBlOjpFbmNvZGVkQmxvYjoKICAg ICAgICAgICAgIGZvcm1EYXRhLT5tX2VsZW1lbnRzLnVuY2hlY2tlZEFwcGVuZChGb3JtRGF0YUVs ZW1lbnQoZWxlbWVudC5tX3VybCkpOwogICAgICAgICAgICAgYnJlYWs7CiAjZW5kaWYKQEAgLTI2 OCw3ICsyNjgsNyBAQCB2b2lkIEZvcm1EYXRhOjphcHBlbmRLZXlWYWx1ZVBhaXJJdGVtcyhjb25z dCBGb3JtRGF0YUxpc3QmIGxpc3QsIGNvbnN0IFRleHRFbmNvZAogCiBjaGFyKiBGb3JtRGF0YTo6 ZXhwYW5kRGF0YVN0b3JlKHNpemVfdCBzaXplKQogewotICAgIGlmIChtX2VsZW1lbnRzLmlzRW1w dHkoKSB8fCBtX2VsZW1lbnRzLmxhc3QoKS5tX3R5cGUgIT0gRm9ybURhdGFFbGVtZW50OjpkYXRh KQorICAgIGlmIChtX2VsZW1lbnRzLmlzRW1wdHkoKSB8fCBtX2VsZW1lbnRzLmxhc3QoKS5tX3R5 cGUgIT0gRm9ybURhdGFFbGVtZW50OjpUeXBlOjpEYXRhKQogICAgICAgICBtX2VsZW1lbnRzLmFw cGVuZChGb3JtRGF0YUVsZW1lbnQoKSk7CiAgICAgRm9ybURhdGFFbGVtZW50JiBlID0gbV9lbGVt ZW50cy5sYXN0KCk7CiAgICAgc2l6ZV90IG9sZFNpemUgPSBlLm1fZGF0YS5zaXplKCk7CkBAIC0y ODMsNyArMjgzLDcgQEAgdm9pZCBGb3JtRGF0YTo6ZmxhdHRlbihWZWN0b3I8Y2hhcj4mIGRhdGEp IGNvbnN0CiAgICAgc2l6ZV90IG4gPSBtX2VsZW1lbnRzLnNpemUoKTsKICAgICBmb3IgKHNpemVf dCBpID0gMDsgaSA8IG47ICsraSkgewogICAgICAgICBjb25zdCBGb3JtRGF0YUVsZW1lbnQmIGUg PSBtX2VsZW1lbnRzW2ldOwotICAgICAgICBpZiAoZS5tX3R5cGUgPT0gRm9ybURhdGFFbGVtZW50 OjpkYXRhKQorICAgICAgICBpZiAoZS5tX3R5cGUgPT0gRm9ybURhdGFFbGVtZW50OjpUeXBlOjpE YXRhKQogICAgICAgICAgICAgZGF0YS5hcHBlbmQoZS5tX2RhdGEuZGF0YSgpLCBzdGF0aWNfY2Fz dDxzaXplX3Q+KGUubV9kYXRhLnNpemUoKSkpOwogICAgIH0KIH0KQEAgLTMzMCw3ICszMzAsNyBA QCBQYXNzUmVmUHRyPEZvcm1EYXRhPiBGb3JtRGF0YTo6cmVzb2x2ZUJsb2JSZWZlcmVuY2VzKCkK ICAgICBWZWN0b3I8Rm9ybURhdGFFbGVtZW50Pjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBlbGVtZW50 cygpLmJlZ2luKCk7CiAgICAgY29uc3QgVmVjdG9yPEZvcm1EYXRhRWxlbWVudD46OmNvbnN0X2l0 ZXJhdG9yIGl0ZW5kID0gZWxlbWVudHMoKS5lbmQoKTsKICAgICBmb3IgKDsgaXQgIT0gaXRlbmQ7 ICsraXQpIHsKLSAgICAgICAgaWYgKGl0LT5tX3R5cGUgPT0gRm9ybURhdGFFbGVtZW50OjplbmNv ZGVkQmxvYikgeworICAgICAgICBpZiAoaXQtPm1fdHlwZSA9PSBGb3JtRGF0YUVsZW1lbnQ6OlR5 cGU6OkVuY29kZWRCbG9iKSB7CiAgICAgICAgICAgICBoYXNCbG9iID0gdHJ1ZTsKICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICB9CkBAIC0zNDYsMTEgKzM0NiwxMSBAQCBQYXNzUmVmUHRyPEZv cm1EYXRhPiBGb3JtRGF0YTo6cmVzb2x2ZUJsb2JSZWZlcmVuY2VzKCkKICAgICBpdCA9IGVsZW1l bnRzKCkuYmVnaW4oKTsKICAgICBmb3IgKDsgaXQgIT0gaXRlbmQ7ICsraXQpIHsKICAgICAgICAg Y29uc3QgRm9ybURhdGFFbGVtZW50JiBlbGVtZW50ID0gKml0OwotICAgICAgICBpZiAoZWxlbWVu dC5tX3R5cGUgPT0gRm9ybURhdGFFbGVtZW50OjpkYXRhKQorICAgICAgICBpZiAoZWxlbWVudC5t X3R5cGUgPT0gRm9ybURhdGFFbGVtZW50OjpUeXBlOjpEYXRhKQogICAgICAgICAgICAgbmV3Rm9y bURhdGEtPmFwcGVuZERhdGEoZWxlbWVudC5tX2RhdGEuZGF0YSgpLCBlbGVtZW50Lm1fZGF0YS5z aXplKCkpOwotICAgICAgICBlbHNlIGlmIChlbGVtZW50Lm1fdHlwZSA9PSBGb3JtRGF0YUVsZW1l bnQ6OmVuY29kZWRGaWxlKQorICAgICAgICBlbHNlIGlmIChlbGVtZW50Lm1fdHlwZSA9PSBGb3Jt RGF0YUVsZW1lbnQ6OlR5cGU6OkVuY29kZWRGaWxlKQogICAgICAgICAgICAgbmV3Rm9ybURhdGEt PmFwcGVuZEZpbGVSYW5nZShlbGVtZW50Lm1fZmlsZW5hbWUsIGVsZW1lbnQubV9maWxlU3RhcnQs IGVsZW1lbnQubV9maWxlTGVuZ3RoLCBlbGVtZW50Lm1fZXhwZWN0ZWRGaWxlTW9kaWZpY2F0aW9u VGltZSwgZWxlbWVudC5tX3Nob3VsZEdlbmVyYXRlRmlsZSk7Ci0gICAgICAgIGVsc2UgaWYgKGVs ZW1lbnQubV90eXBlID09IEZvcm1EYXRhRWxlbWVudDo6ZW5jb2RlZEJsb2IpCisgICAgICAgIGVs c2UgaWYgKGVsZW1lbnQubV90eXBlID09IEZvcm1EYXRhRWxlbWVudDo6VHlwZTo6RW5jb2RlZEJs b2IpCiAgICAgICAgICAgICBhcHBlbmRCbG9iUmVzb2x2ZWQobmV3Rm9ybURhdGEuZ2V0KCksIGVs ZW1lbnQubV91cmwpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNI RUQoKTsKQEAgLTM2Niw3ICszNjYsNyBAQCB2b2lkIEZvcm1EYXRhOjpnZW5lcmF0ZUZpbGVzKERv Y3VtZW50KiBkb2N1bWVudCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgZm9yIChGb3JtRGF0YUVs ZW1lbnQmIGVsZW1lbnQgOiBtX2VsZW1lbnRzKSB7Ci0gICAgICAgIGlmIChlbGVtZW50Lm1fdHlw ZSA9PSBGb3JtRGF0YUVsZW1lbnQ6OmVuY29kZWRGaWxlICYmIGVsZW1lbnQubV9zaG91bGRHZW5l cmF0ZUZpbGUpIHsKKyAgICAgICAgaWYgKGVsZW1lbnQubV90eXBlID09IEZvcm1EYXRhRWxlbWVu dDo6VHlwZTo6RW5jb2RlZEZpbGUgJiYgZWxlbWVudC5tX3Nob3VsZEdlbmVyYXRlRmlsZSkgewog ICAgICAgICAgICAgQVNTRVJUKCFlbGVtZW50Lm1fb3duc0dlbmVyYXRlZEZpbGUpOwogICAgICAg ICAgICAgQVNTRVJUKGVsZW1lbnQubV9nZW5lcmF0ZWRGaWxlbmFtZS5pc0VtcHR5KCkpOwogICAg ICAgICAgICAgaWYgKCFlbGVtZW50Lm1fZ2VuZXJhdGVkRmlsZW5hbWUuaXNFbXB0eSgpKQpAQCAt MzgxLDcgKzM4MSw3IEBAIHZvaWQgRm9ybURhdGE6OmdlbmVyYXRlRmlsZXMoRG9jdW1lbnQqIGRv Y3VtZW50KQogYm9vbCBGb3JtRGF0YTo6aGFzR2VuZXJhdGVkRmlsZXMoKSBjb25zdAogewogICAg IGZvciAoY29uc3QgRm9ybURhdGFFbGVtZW50JiBlbGVtZW50IDogbV9lbGVtZW50cykgewotICAg ICAgICBpZiAoZWxlbWVudC5tX3R5cGUgPT0gRm9ybURhdGFFbGVtZW50OjplbmNvZGVkRmlsZSAm JiAhZWxlbWVudC5tX2dlbmVyYXRlZEZpbGVuYW1lLmlzRW1wdHkoKSkKKyAgICAgICAgaWYgKGVs ZW1lbnQubV90eXBlID09IEZvcm1EYXRhRWxlbWVudDo6VHlwZTo6RW5jb2RlZEZpbGUgJiYgIWVs ZW1lbnQubV9nZW5lcmF0ZWRGaWxlbmFtZS5pc0VtcHR5KCkpCiAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKICAgICB9CiAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMzkwLDcgKzM5MCw3IEBAIGJvb2wg Rm9ybURhdGE6Omhhc0dlbmVyYXRlZEZpbGVzKCkgY29uc3QKIGJvb2wgRm9ybURhdGE6Omhhc093 bmVkR2VuZXJhdGVkRmlsZXMoKSBjb25zdAogewogICAgIGZvciAoY29uc3QgRm9ybURhdGFFbGVt ZW50JiBlbGVtZW50IDogbV9lbGVtZW50cykgewotICAgICAgICBpZiAoZWxlbWVudC5tX3R5cGUg PT0gRm9ybURhdGFFbGVtZW50OjplbmNvZGVkRmlsZSAmJiBlbGVtZW50Lm1fb3duc0dlbmVyYXRl ZEZpbGUpIHsKKyAgICAgICAgaWYgKGVsZW1lbnQubV90eXBlID09IEZvcm1EYXRhRWxlbWVudDo6 VHlwZTo6RW5jb2RlZEZpbGUgJiYgZWxlbWVudC5tX293bnNHZW5lcmF0ZWRGaWxlKSB7CiAgICAg ICAgICAgICBBU1NFUlQoIWVsZW1lbnQubV9nZW5lcmF0ZWRGaWxlbmFtZS5pc0VtcHR5KCkpOwog ICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KQEAgLTQwMSw3ICs0MDEsNyBAQCBi b29sIEZvcm1EYXRhOjpoYXNPd25lZEdlbmVyYXRlZEZpbGVzKCkgY29uc3QKIHZvaWQgRm9ybURh dGE6OnJlbW92ZUdlbmVyYXRlZEZpbGVzSWZOZWVkZWQoKQogewogICAgIGZvciAoRm9ybURhdGFF bGVtZW50JiBlbGVtZW50IDogbV9lbGVtZW50cykgewotICAgICAgICBpZiAoZWxlbWVudC5tX3R5 cGUgPT0gRm9ybURhdGFFbGVtZW50OjplbmNvZGVkRmlsZSAmJiBlbGVtZW50Lm1fb3duc0dlbmVy YXRlZEZpbGUpIHsKKyAgICAgICAgaWYgKGVsZW1lbnQubV90eXBlID09IEZvcm1EYXRhRWxlbWVu dDo6VHlwZTo6RW5jb2RlZEZpbGUgJiYgZWxlbWVudC5tX293bnNHZW5lcmF0ZWRGaWxlKSB7CiAg ICAgICAgICAgICBBU1NFUlQoIWVsZW1lbnQubV9nZW5lcmF0ZWRGaWxlbmFtZS5pc0VtcHR5KCkp OwogICAgICAgICAgICAgQVNTRVJUKGVsZW1lbnQubV9zaG91bGRHZW5lcmF0ZUZpbGUpOwogICAg ICAgICAgICAgU3RyaW5nIGRpcmVjdG9yeSA9IGRpcmVjdG9yeU5hbWUoZWxlbWVudC5tX2dlbmVy YXRlZEZpbGVuYW1lKTsKQEAgLTQxNSwxNCArNDE1LDE0IEBAIHZvaWQgRm9ybURhdGE6OnJlbW92 ZUdlbmVyYXRlZEZpbGVzSWZOZWVkZWQoKQogCiBzdGF0aWMgdm9pZCBlbmNvZGVFbGVtZW50KEVu Y29kZXImIGVuY29kZXIsIGNvbnN0IEZvcm1EYXRhRWxlbWVudCYgZWxlbWVudCkKIHsKLSAgICBl bmNvZGVyLmVuY29kZVVJbnQzMihlbGVtZW50Lm1fdHlwZSk7CisgICAgZW5jb2Rlci5lbmNvZGVV SW50MzIoc3RhdGljX2Nhc3Q8dWludDMyX3Q+KGVsZW1lbnQubV90eXBlKSk7CiAKICAgICBzd2l0 Y2ggKGVsZW1lbnQubV90eXBlKSB7Ci0gICAgY2FzZSBGb3JtRGF0YUVsZW1lbnQ6OmRhdGE6Cisg ICAgY2FzZSBGb3JtRGF0YUVsZW1lbnQ6OlR5cGU6OkRhdGE6CiAgICAgICAgIGVuY29kZXIuZW5j b2RlQnl0ZXMocmVpbnRlcnByZXRfY2FzdDxjb25zdCB1aW50OF90Kj4oZWxlbWVudC5tX2RhdGEu ZGF0YSgpKSwgZWxlbWVudC5tX2RhdGEuc2l6ZSgpKTsKICAgICAgICAgcmV0dXJuOwogCi0gICAg Y2FzZSBGb3JtRGF0YUVsZW1lbnQ6OmVuY29kZWRGaWxlOgorICAgIGNhc2UgRm9ybURhdGFFbGVt ZW50OjpUeXBlOjpFbmNvZGVkRmlsZToKICAgICAgICAgZW5jb2Rlci5lbmNvZGVTdHJpbmcoZWxl bWVudC5tX2ZpbGVuYW1lKTsKICAgICAgICAgZW5jb2Rlci5lbmNvZGVTdHJpbmcoZWxlbWVudC5t X2dlbmVyYXRlZEZpbGVuYW1lKTsKICAgICAgICAgZW5jb2Rlci5lbmNvZGVCb29sKGVsZW1lbnQu bV9zaG91bGRHZW5lcmF0ZUZpbGUpOwpAQCAtNDM4LDcgKzQzOCw3IEBAIHN0YXRpYyB2b2lkIGVu Y29kZUVsZW1lbnQoRW5jb2RlciYgZW5jb2RlciwgY29uc3QgRm9ybURhdGFFbGVtZW50JiBlbGVt ZW50KQogICAgICAgICByZXR1cm47CiAKICNpZiBFTkFCTEUoQkxPQikKLSAgICBjYXNlIEZvcm1E YXRhRWxlbWVudDo6ZW5jb2RlZEJsb2I6CisgICAgY2FzZSBGb3JtRGF0YUVsZW1lbnQ6OlR5cGU6 OkVuY29kZWRCbG9iOgogICAgICAgICBlbmNvZGVyLmVuY29kZVN0cmluZyhlbGVtZW50Lm1fdXJs LnN0cmluZygpKTsKICAgICAgICAgcmV0dXJuOwogI2VuZGlmCkBAIC00NTIsMTAgKzQ1MiwxMCBA QCBzdGF0aWMgdm9pZCBlbmNvZGVFbGVtZW50KEtleWVkRW5jb2RlciYgZW5jb2RlciwgY29uc3Qg Rm9ybURhdGFFbGVtZW50JiBlbGVtZW50KQogICAgIGVuY29kZXIuZW5jb2RlRW51bSgidHlwZSIs IGVsZW1lbnQubV90eXBlKTsKIAogICAgIHN3aXRjaCAoZWxlbWVudC5tX3R5cGUpIHsKLSAgICBj YXNlIEZvcm1EYXRhRWxlbWVudDo6ZGF0YToKKyAgICBjYXNlIEZvcm1EYXRhRWxlbWVudDo6VHlw ZTo6RGF0YToKICAgICAgICAgZW5jb2Rlci5lbmNvZGVCeXRlcygiZGF0YSIsIHJlaW50ZXJwcmV0 X2Nhc3Q8Y29uc3QgdWludDhfdCo+KGVsZW1lbnQubV9kYXRhLmRhdGEoKSksIGVsZW1lbnQubV9k YXRhLnNpemUoKSk7CiAgICAgICAgIHJldHVybjsKLSAgICBjYXNlIEZvcm1EYXRhRWxlbWVudDo6 ZW5jb2RlZEZpbGU6CisgICAgY2FzZSBGb3JtRGF0YUVsZW1lbnQ6OlR5cGU6OkVuY29kZWRGaWxl OgogICAgICAgICBlbmNvZGVyLmVuY29kZVN0cmluZygiZmlsZW5hbWUiLCBlbGVtZW50Lm1fZmls ZW5hbWUpOwogICAgICAgICBlbmNvZGVyLmVuY29kZVN0cmluZygiZ2VuZXJhdGVkRmlsZW5hbWUi LCBlbGVtZW50Lm1fZ2VuZXJhdGVkRmlsZW5hbWUpOwogICAgICAgICBlbmNvZGVyLmVuY29kZUJv b2woInNob3VsZEdlbmVyYXRlRmlsZSIsIGVsZW1lbnQubV9zaG91bGRHZW5lcmF0ZUZpbGUpOwpA QCAtNDY3LDcgKzQ2Nyw3IEBAIHN0YXRpYyB2b2lkIGVuY29kZUVsZW1lbnQoS2V5ZWRFbmNvZGVy JiBlbmNvZGVyLCBjb25zdCBGb3JtRGF0YUVsZW1lbnQmIGVsZW1lbnQpCiAgICAgICAgIHJldHVy bjsKIAogI2lmIEVOQUJMRShCTE9CKQotICAgIGNhc2UgRm9ybURhdGFFbGVtZW50OjplbmNvZGVk QmxvYjoKKyAgICBjYXNlIEZvcm1EYXRhRWxlbWVudDo6VHlwZTo6RW5jb2RlZEJsb2I6CiAgICAg ICAgIGVuY29kZXIuZW5jb2RlU3RyaW5nKCJ1cmwiLCBlbGVtZW50Lm1fdXJsLnN0cmluZygpKTsK ICAgICAgICAgcmV0dXJuOwogI2VuZGlmCkBAIC00ODIsOSArNDgyLDkgQEAgc3RhdGljIGJvb2wg ZGVjb2RlRWxlbWVudChEZWNvZGVyJiBkZWNvZGVyLCBGb3JtRGF0YUVsZW1lbnQmIGVsZW1lbnQp CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZVVJbnQzMih0eXBlKSkKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCi0gICAgc3dpdGNoICh0eXBlKSB7Ci0gICAgY2FzZSBGb3JtRGF0YUVsZW1lbnQ6OmRh dGE6IHsKLSAgICAgICAgZWxlbWVudC5tX3R5cGUgPSBGb3JtRGF0YUVsZW1lbnQ6OmRhdGE7Cisg ICAgc3dpdGNoIChzdGF0aWNfY2FzdDxGb3JtRGF0YUVsZW1lbnQ6OlR5cGU+KHR5cGUpKSB7Cisg ICAgY2FzZSBGb3JtRGF0YUVsZW1lbnQ6OlR5cGU6OkRhdGE6IHsKKyAgICAgICAgZWxlbWVudC5t X3R5cGUgPSBGb3JtRGF0YUVsZW1lbnQ6OlR5cGU6OkRhdGE7CiAgICAgICAgIFZlY3Rvcjx1aW50 OF90PiBkYXRhOwogICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlQnl0ZXMoZGF0YSkpCiAgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC00OTQsMTMgKzQ5NCwxMiBAQCBzdGF0aWMgYm9vbCBk ZWNvZGVFbGVtZW50KERlY29kZXImIGRlY29kZXIsIEZvcm1EYXRhRWxlbWVudCYgZWxlbWVudCkK ICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCi0gICAgY2FzZSBGb3JtRGF0YUVsZW1lbnQ6 OmVuY29kZWRGaWxlOgotICAgIHsKKyAgICBjYXNlIEZvcm1EYXRhRWxlbWVudDo6VHlwZTo6RW5j b2RlZEZpbGU6IHsKICAgICAgICAgZWxlbWVudC5tX3R5cGUgPSBzdGF0aWNfY2FzdDxGb3JtRGF0 YUVsZW1lbnQ6OlR5cGU+KHR5cGUpOwogICAgICAgICBTdHJpbmcgZmlsZW5hbWVPclVSTDsKICAg ICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZVN0cmluZyhmaWxlbmFtZU9yVVJMKSkKICAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgaWYgKHR5cGUgPT0gRm9ybURhdGFFbGVtZW50Ojpl bmNvZGVkRmlsZSkgeworICAgICAgICBpZiAoc3RhdGljX2Nhc3Q8Rm9ybURhdGFFbGVtZW50OjpU eXBlPih0eXBlKSA9PSBGb3JtRGF0YUVsZW1lbnQ6OlR5cGU6OkVuY29kZWRGaWxlKSB7CiAgICAg ICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlU3RyaW5nKGVsZW1lbnQubV9nZW5lcmF0ZWRGaWxl bmFtZSkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgaWYgKCFk ZWNvZGVyLmRlY29kZUJvb2woZWxlbWVudC5tX3Nob3VsZEdlbmVyYXRlRmlsZSkpCkBAIC01MzAs OCArNTI5LDggQEAgc3RhdGljIGJvb2wgZGVjb2RlRWxlbWVudChEZWNvZGVyJiBkZWNvZGVyLCBG b3JtRGF0YUVsZW1lbnQmIGVsZW1lbnQpCiAgICAgfQogCiAjaWYgRU5BQkxFKEJMT0IpCi0gICAg Y2FzZSBGb3JtRGF0YUVsZW1lbnQ6OmVuY29kZWRCbG9iOgotICAgICAgICBlbGVtZW50Lm1fdHlw ZSA9IEZvcm1EYXRhRWxlbWVudDo6ZW5jb2RlZEJsb2I7CisgICAgY2FzZSBGb3JtRGF0YUVsZW1l bnQ6OlR5cGU6OkVuY29kZWRCbG9iOgorICAgICAgICBlbGVtZW50Lm1fdHlwZSA9IEZvcm1EYXRh RWxlbWVudDo6VHlwZTo6RW5jb2RlZEJsb2I7CiAgICAgICAgIFN0cmluZyBibG9iVVJMU3RyaW5n OwogICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlU3RyaW5nKGJsb2JVUkxTdHJpbmcpKQogICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9Gb3JtRGF0YS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9G b3JtRGF0YS5oCmluZGV4IDYxNmIyYzFmYzEwNTVmMWUzMzExMTdmNzYwNDFjZGJkMzY3NTJhYjMu Ljc0ZDlkOTYyMTJiMDk2NzcyNzRjZWNmMTQ4ZTYzMGZkYTY3ZjMzMzcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRm9ybURhdGEuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL0Zvcm1EYXRhLmgKQEAgLTM1LDIzICszNSw1MyBAQCBjbGFz cyBUZXh0RW5jb2Rpbmc7CiAKIGNsYXNzIEZvcm1EYXRhRWxlbWVudCB7CiBwdWJsaWM6Ci0gICAg Rm9ybURhdGFFbGVtZW50KCkgOiBtX3R5cGUoZGF0YSkgeyB9Ci0gICAgZXhwbGljaXQgRm9ybURh dGFFbGVtZW50KGNvbnN0IFZlY3RvcjxjaGFyPiYgYXJyYXkpIDogbV90eXBlKGRhdGEpLCBtX2Rh dGEoYXJyYXkpIHsgfQotCisgICAgZW51bSBjbGFzcyBUeXBlIHsKKyAgICAgICAgRGF0YSwKKyAg ICAgICAgRW5jb2RlZEZpbGUsCiAjaWYgRU5BQkxFKEJMT0IpCi0gICAgRm9ybURhdGFFbGVtZW50 KGNvbnN0IFN0cmluZyYgZmlsZW5hbWUsIGxvbmcgbG9uZyBmaWxlU3RhcnQsIGxvbmcgbG9uZyBm aWxlTGVuZ3RoLCBkb3VibGUgZXhwZWN0ZWRGaWxlTW9kaWZpY2F0aW9uVGltZSwgYm9vbCBzaG91 bGRHZW5lcmF0ZUZpbGUpIDogbV90eXBlKGVuY29kZWRGaWxlKSwgbV9maWxlbmFtZShmaWxlbmFt ZSksIG1fZmlsZVN0YXJ0KGZpbGVTdGFydCksIG1fZmlsZUxlbmd0aChmaWxlTGVuZ3RoKSwgbV9l eHBlY3RlZEZpbGVNb2RpZmljYXRpb25UaW1lKGV4cGVjdGVkRmlsZU1vZGlmaWNhdGlvblRpbWUp LCBtX3Nob3VsZEdlbmVyYXRlRmlsZShzaG91bGRHZW5lcmF0ZUZpbGUpLCBtX293bnNHZW5lcmF0 ZWRGaWxlKGZhbHNlKSB7IH0KLSAgICBleHBsaWNpdCBGb3JtRGF0YUVsZW1lbnQoY29uc3QgVVJM JiBibG9iVVJMKSA6IG1fdHlwZShlbmNvZGVkQmxvYiksIG1fdXJsKGJsb2JVUkwpIHsgfQotI2Vs c2UKLSAgICBGb3JtRGF0YUVsZW1lbnQoY29uc3QgU3RyaW5nJiBmaWxlbmFtZSwgYm9vbCBzaG91 bGRHZW5lcmF0ZUZpbGUpIDogbV90eXBlKGVuY29kZWRGaWxlKSwgbV9maWxlbmFtZShmaWxlbmFt ZSksIG1fc2hvdWxkR2VuZXJhdGVGaWxlKHNob3VsZEdlbmVyYXRlRmlsZSksIG1fb3duc0dlbmVy YXRlZEZpbGUoZmFsc2UpIHsgfQorICAgICAgICBFbmNvZGVkQmxvYiwKICNlbmRpZgorICAgIH07 CisKKyAgICBGb3JtRGF0YUVsZW1lbnQoKQorICAgICAgICA6IG1fdHlwZShUeXBlOjpEYXRhKQor ICAgIHsKKyAgICB9CisKKyAgICBleHBsaWNpdCBGb3JtRGF0YUVsZW1lbnQoY29uc3QgVmVjdG9y PGNoYXI+JiBhcnJheSkKKyAgICAgICAgOiBtX3R5cGUoVHlwZTo6RGF0YSkKKyAgICAgICAgLCBt X2RhdGEoYXJyYXkpCisgICAgeworICAgIH0KIAotICAgIGVudW0gVHlwZSB7Ci0gICAgICAgIGRh dGEsCi0gICAgICAgIGVuY29kZWRGaWxlCiAjaWYgRU5BQkxFKEJMT0IpCi0gICAgICAgICwgZW5j b2RlZEJsb2IKKyAgICBGb3JtRGF0YUVsZW1lbnQoY29uc3QgU3RyaW5nJiBmaWxlbmFtZSwgbG9u ZyBsb25nIGZpbGVTdGFydCwgbG9uZyBsb25nIGZpbGVMZW5ndGgsIGRvdWJsZSBleHBlY3RlZEZp bGVNb2RpZmljYXRpb25UaW1lLCBib29sIHNob3VsZEdlbmVyYXRlRmlsZSkKKyAgICAgICAgOiBt X3R5cGUoVHlwZTo6RW5jb2RlZEZpbGUpCisgICAgICAgICwgbV9maWxlbmFtZShmaWxlbmFtZSkK KyAgICAgICAgLCBtX2ZpbGVTdGFydChmaWxlU3RhcnQpCisgICAgICAgICwgbV9maWxlTGVuZ3Ro KGZpbGVMZW5ndGgpCisgICAgICAgICwgbV9leHBlY3RlZEZpbGVNb2RpZmljYXRpb25UaW1lKGV4 cGVjdGVkRmlsZU1vZGlmaWNhdGlvblRpbWUpCisgICAgICAgICwgbV9zaG91bGRHZW5lcmF0ZUZp bGUoc2hvdWxkR2VuZXJhdGVGaWxlKQorICAgICAgICAsIG1fb3duc0dlbmVyYXRlZEZpbGUoZmFs c2UpCisgICAgeworICAgIH0KKworICAgIGV4cGxpY2l0IEZvcm1EYXRhRWxlbWVudChjb25zdCBV UkwmIGJsb2JVUkwpCisgICAgICAgIDogbV90eXBlKFR5cGU6OkVuY29kZWRCbG9iKQorICAgICAg ICAsIG1fdXJsKGJsb2JVUkwpCisgICAgeworICAgIH0KKyNlbHNlCisgICAgRm9ybURhdGFFbGVt ZW50KGNvbnN0IFN0cmluZyYgZmlsZW5hbWUsIGJvb2wgc2hvdWxkR2VuZXJhdGVGaWxlKQorICAg ICAgICA6IG1fdHlwZShUeXBlOjpFbmNvZGVkRmlsZSkKKyAgICAgICAgLCBtX2ZpbGVuYW1lKGZp bGVuYW1lKQorICAgICAgICAsIG1fc2hvdWxkR2VuZXJhdGVGaWxlKHNob3VsZEdlbmVyYXRlRmls ZSkKKyAgICAgICAgLCBtX293bnNHZW5lcmF0ZWRGaWxlKGZhbHNlKQorICAgIHsKKyAgICB9CiAj ZW5kaWYKLSAgICB9IG1fdHlwZTsKKworICAgIFR5cGUgbV90eXBlOwogICAgIFZlY3RvcjxjaGFy PiBtX2RhdGE7CiAgICAgU3RyaW5nIG1fZmlsZW5hbWU7CiAjaWYgRU5BQkxFKEJMT0IpCkBAIC03 MiwxMiArMTAyLDEyIEBAIGlubGluZSBib29sIG9wZXJhdG9yPT0oY29uc3QgRm9ybURhdGFFbGVt ZW50JiBhLCBjb25zdCBGb3JtRGF0YUVsZW1lbnQmIGIpCiAKICAgICBpZiAoYS5tX3R5cGUgIT0g Yi5tX3R5cGUpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBpZiAoYS5tX3R5cGUgPT0gRm9y bURhdGFFbGVtZW50OjpkYXRhKQorICAgIGlmIChhLm1fdHlwZSA9PSBGb3JtRGF0YUVsZW1lbnQ6 OlR5cGU6OkRhdGEpCiAgICAgICAgIHJldHVybiBhLm1fZGF0YSA9PSBiLm1fZGF0YTsKLSAgICBp ZiAoYS5tX3R5cGUgPT0gRm9ybURhdGFFbGVtZW50OjplbmNvZGVkRmlsZSkKKyAgICBpZiAoYS5t X3R5cGUgPT0gRm9ybURhdGFFbGVtZW50OjpUeXBlOjpFbmNvZGVkRmlsZSkKICNpZiBFTkFCTEUo QkxPQikKICAgICAgICAgcmV0dXJuIGEubV9maWxlbmFtZSA9PSBiLm1fZmlsZW5hbWUgJiYgYS5t X2ZpbGVTdGFydCA9PSBiLm1fZmlsZVN0YXJ0ICYmIGEubV9maWxlTGVuZ3RoID09IGIubV9maWxl TGVuZ3RoICYmIGEubV9leHBlY3RlZEZpbGVNb2RpZmljYXRpb25UaW1lID09IGIubV9leHBlY3Rl ZEZpbGVNb2RpZmljYXRpb25UaW1lOwotICAgIGlmIChhLm1fdHlwZSA9PSBGb3JtRGF0YUVsZW1l bnQ6OmVuY29kZWRCbG9iKQorICAgIGlmIChhLm1fdHlwZSA9PSBGb3JtRGF0YUVsZW1lbnQ6OlR5 cGU6OkVuY29kZWRCbG9iKQogICAgICAgICByZXR1cm4gYS5tX3VybCA9PSBiLm1fdXJsOwogI2Vs c2UKICAgICAgICAgcmV0dXJuIGEubV9maWxlbmFtZSA9PSBiLm1fZmlsZW5hbWU7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL0Zvcm1EYXRhU3RyZWFtQ0ZO ZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9Gb3JtRGF0YVN0cmVh bUNGTmV0LmNwcAppbmRleCA1ODgzNGI1YjQ3YWFiN2I3NWI4N2MwYTc2MjFmM2FjOWFlYjE3NGFj Li4yMTljODIxYjM5Yjc1ODc4YmM5NGUzMDNmOTAxNmFkNmQ5MDJkZDFmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL0Zvcm1EYXRhU3RyZWFtQ0ZOZXQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvRm9ybURhdGFTdHJlYW1D Rk5ldC5jcHAKQEAgLTEzOSw3ICsxMzksNyBAQCBzdGF0aWMgYm9vbCBhZHZhbmNlQ3VycmVudFN0 cmVhbShGb3JtU3RyZWFtRmllbGRzKiBmb3JtKQogICAgIC8vIENyZWF0ZSB0aGUgbmV3IHN0cmVh bS4KICAgICBGb3JtRGF0YUVsZW1lbnQmIG5leHRJbnB1dCA9IGZvcm0tPnJlbWFpbmluZ0VsZW1l bnRzLmxhc3QoKTsKIAotICAgIGlmIChuZXh0SW5wdXQubV90eXBlID09IEZvcm1EYXRhRWxlbWVu dDo6ZGF0YSkgeworICAgIGlmIChuZXh0SW5wdXQubV90eXBlID09IEZvcm1EYXRhRWxlbWVudDo6 VHlwZTo6RGF0YSkgewogICAgICAgICBzaXplX3Qgc2l6ZSA9IG5leHRJbnB1dC5tX2RhdGEuc2l6 ZSgpOwogICAgICAgICBNYWxsb2NQdHI8Y2hhcj4gZGF0YSA9IG5leHRJbnB1dC5tX2RhdGEucmVs ZWFzZUJ1ZmZlcigpOwogICAgICAgICBmb3JtLT5jdXJyZW50U3RyZWFtID0gQ0ZSZWFkU3RyZWFt Q3JlYXRlV2l0aEJ5dGVzTm9Db3B5KDAsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgVUludDgqPihk YXRhLmdldCgpKSwgc2l6ZSwga0NGQWxsb2NhdG9yTnVsbCk7CkBAIC0zNzgsNyArMzc4LDcgQEAg dm9pZCBzZXRIVFRQQm9keShDRk11dGFibGVVUkxSZXF1ZXN0UmVmIHJlcXVlc3QsIFBhc3NSZWZQ dHI8Rm9ybURhdGE+IHBycEZvcm1EYXQKICAgICAvLyBIYW5kbGUgdGhlIGNvbW1vbiBzcGVjaWFs IGNhc2Ugb2Ygb25lIHBpZWNlIG9mIGZvcm0gZGF0YSwgd2l0aCBubyBmaWxlcy4KICAgICBpZiAo Y291bnQgPT0gMSAmJiAhZm9ybURhdGEtPmFsd2F5c1N0cmVhbSgpKSB7CiAgICAgICAgIGNvbnN0 IEZvcm1EYXRhRWxlbWVudCYgZWxlbWVudCA9IGZvcm1EYXRhLT5lbGVtZW50cygpWzBdOwotICAg ICAgICBpZiAoZWxlbWVudC5tX3R5cGUgPT0gRm9ybURhdGFFbGVtZW50OjpkYXRhKSB7CisgICAg ICAgIGlmIChlbGVtZW50Lm1fdHlwZSA9PSBGb3JtRGF0YUVsZW1lbnQ6OlR5cGU6OkRhdGEpIHsK ICAgICAgICAgICAgIFJldGFpblB0cjxDRkRhdGFSZWY+IGRhdGEgPSBhZG9wdENGKENGRGF0YUNy ZWF0ZSgwLCByZWludGVycHJldF9jYXN0PGNvbnN0IFVJbnQ4ICo+KGVsZW1lbnQubV9kYXRhLmRh dGEoKSksIGVsZW1lbnQubV9kYXRhLnNpemUoKSkpOwogICAgICAgICAgICAgQ0ZVUkxSZXF1ZXN0 U2V0SFRUUFJlcXVlc3RCb2R5KHJlcXVlc3QsIGRhdGEuZ2V0KCkpOwogICAgICAgICAgICAgcmV0 dXJuOwpAQCAtMzk0LDcgKzM5NCw3IEBAIHZvaWQgc2V0SFRUUEJvZHkoQ0ZNdXRhYmxlVVJMUmVx dWVzdFJlZiByZXF1ZXN0LCBQYXNzUmVmUHRyPEZvcm1EYXRhPiBwcnBGb3JtRGF0CiAgICAgdW5z aWduZWQgbG9uZyBsb25nIGxlbmd0aCA9IDA7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBj b3VudDsgKytpKSB7CiAgICAgICAgIGNvbnN0IEZvcm1EYXRhRWxlbWVudCYgZWxlbWVudCA9IGZv cm1EYXRhLT5lbGVtZW50cygpW2ldOwotICAgICAgICBpZiAoZWxlbWVudC5tX3R5cGUgPT0gRm9y bURhdGFFbGVtZW50OjpkYXRhKQorICAgICAgICBpZiAoZWxlbWVudC5tX3R5cGUgPT0gRm9ybURh dGFFbGVtZW50OjpUeXBlOjpEYXRhKQogICAgICAgICAgICAgbGVuZ3RoICs9IGVsZW1lbnQubV9k YXRhLnNpemUoKTsKICAgICAgICAgZWxzZSB7CiAjaWYgRU5BQkxFKEJMT0IpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvRm9ybURhdGFTdHJlYW1DdXJs LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9Gb3JtRGF0YVN0cmVh bUN1cmwuY3BwCmluZGV4IDQ3YjE3ZjU4YzY5ZTk2YjliZmQ5ZGQ4ZmM0MzBlYzUzMTI2MWJiZjIu Ljk4ZGQ0OTM1YWU2MWIxZTg0YWNkZDJlODQzMzNjMDc5YTdjNWQ0ZTQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9Gb3JtRGF0YVN0cmVhbUN1cmwuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9Gb3JtRGF0YVN0cmVh bUN1cmwuY3BwCkBAIC02NCw3ICs2NCw3IEBAIHNpemVfdCBGb3JtRGF0YVN0cmVhbTo6cmVhZCh2 b2lkKiBwdHIsIHNpemVfdCBibG9ja1NpemUsIHNpemVfdCBudW1iZXJPZkJsb2NrcykKICAgICBz aXplX3QgdG9TZW5kID0gYmxvY2tTaXplICogbnVtYmVyT2ZCbG9ja3M7CiAgICAgc2l6ZV90IHNl bnQ7CiAKLSAgICBpZiAoZWxlbWVudC5tX3R5cGUgPT0gRm9ybURhdGFFbGVtZW50OjplbmNvZGVk RmlsZSkgeworICAgIGlmIChlbGVtZW50Lm1fdHlwZSA9PSBGb3JtRGF0YUVsZW1lbnQ6OlR5cGU6 OkVuY29kZWRGaWxlKSB7CiAgICAgICAgIGlmICghbV9maWxlKQogICAgICAgICAgICAgbV9maWxl ID0gZm9wZW4oZWxlbWVudC5tX2ZpbGVuYW1lLnV0ZjgoKS5kYXRhKCksICJyYiIpOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5k bGVNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNv dXJjZUhhbmRsZU1hbmFnZXIuY3BwCmluZGV4IDI4NzNkNmI2MTdlOWU3MWZlM2UyMTIyMTViNDZi M2ZhY2Y1ZjExYzcuLjM3MmYwMzRhMGU2MDk4ZTUwOTAwMTdkM2YyNGI0YWEzNWI4ZTU0NzYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhh bmRsZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3Vy bC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIuY3BwCkBAIC03ODIsNyArNzgyLDcgQEAgc3RhdGljIHZv aWQgc2V0dXBGb3JtRGF0YShSZXNvdXJjZUhhbmRsZSogam9iLCBDVVJMb3B0aW9uIHNpemVPcHRp b24sIHN0cnVjdCBjdXIKICAgICBib29sIGNodW5rZWRUcmFuc2ZlciA9IGZhbHNlOwogICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgbnVtRWxlbWVudHM7IGkrKykgewogICAgICAgICBGb3JtRGF0 YUVsZW1lbnQgZWxlbWVudCA9IGVsZW1lbnRzW2ldOwotICAgICAgICBpZiAoZWxlbWVudC5tX3R5 cGUgPT0gRm9ybURhdGFFbGVtZW50OjplbmNvZGVkRmlsZSkgeworICAgICAgICBpZiAoZWxlbWVu dC5tX3R5cGUgPT0gRm9ybURhdGFFbGVtZW50OjpUeXBlOjpFbmNvZGVkRmlsZSkgewogICAgICAg ICAgICAgbG9uZyBsb25nIGZpbGVTaXplUmVzdWx0OwogICAgICAgICAgICAgaWYgKGdldEZpbGVT aXplKGVsZW1lbnQubV9maWxlbmFtZSwgZmlsZVNpemVSZXN1bHQpKSB7CiAgICAgICAgICAgICAg ICAgaWYgKGZpbGVTaXplUmVzdWx0ID4gbWF4Q3VybE9mZlQpIHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5j cHAKaW5kZXggMjFjN2JiYWFkMzlhYzFhNjIwNmIxY2Y0NWY2YzY1NTNhOWNlZDU0Ni4uZWZkZmZl YTI1YTAyZjUzZWNiOTEzZjMxYzU5NTJhZjBkY2RmYmM1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5j cHAKQEAgLTgxNCwxNCArODE0LDE0IEBAIHN0YXRpYyBib29sIGFkZEZvcm1FbGVtZW50c1RvU291 cE1lc3NhZ2UoU291cE1lc3NhZ2UqIG1lc3NhZ2UsIGNvbnN0IGNoYXIqLCBGb3JtCiAgICAgZm9y IChzaXplX3QgaSA9IDA7IGkgPCBudW1FbGVtZW50czsgaSsrKSB7CiAgICAgICAgIGNvbnN0IEZv cm1EYXRhRWxlbWVudCYgZWxlbWVudCA9IGh0dHBCb2R5LT5lbGVtZW50cygpW2ldOwogCi0gICAg ICAgIGlmIChlbGVtZW50Lm1fdHlwZSA9PSBGb3JtRGF0YUVsZW1lbnQ6OmRhdGEpIHsKKyAgICAg ICAgaWYgKGVsZW1lbnQubV90eXBlID09IEZvcm1EYXRhRWxlbWVudDo6VHlwZTo6RGF0YSkgewog ICAgICAgICAgICAgdG90YWxCb2R5U2l6ZSArPSBlbGVtZW50Lm1fZGF0YS5zaXplKCk7CiAgICAg ICAgICAgICBzb3VwX21lc3NhZ2VfYm9keV9hcHBlbmQobWVzc2FnZS0+cmVxdWVzdF9ib2R5LCBT T1VQX01FTU9SWV9URU1QT1JBUlksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgZWxlbWVudC5tX2RhdGEuZGF0YSgpLCBlbGVtZW50Lm1fZGF0YS5zaXplKCkpOwogICAgICAg ICAgICAgY29udGludWU7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoZWxlbWVudC5tX3R5cGUg PT0gRm9ybURhdGFFbGVtZW50OjplbmNvZGVkRmlsZSkgeworICAgICAgICBpZiAoZWxlbWVudC5t X3R5cGUgPT0gRm9ybURhdGFFbGVtZW50OjpUeXBlOjpFbmNvZGVkRmlsZSkgewogICAgICAgICAg ICAgaWYgKCFhZGRGaWxlVG9Tb3VwTWVzc2FnZUJvZHkobWVzc2FnZSAsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVsZW1lbnQubV9maWxlbmFtZSwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMCAvKiBvZmZzZXQgKi8sCkBAIC04MzIs NyArODMyLDcgQEAgc3RhdGljIGJvb2wgYWRkRm9ybUVsZW1lbnRzVG9Tb3VwTWVzc2FnZShTb3Vw TWVzc2FnZSogbWVzc2FnZSwgY29uc3QgY2hhciosIEZvcm0KICAgICAgICAgfQogCiAjaWYgRU5B QkxFKEJMT0IpCi0gICAgICAgIEFTU0VSVChlbGVtZW50Lm1fdHlwZSA9PSBGb3JtRGF0YUVsZW1l bnQ6OmVuY29kZWRCbG9iKTsKKyAgICAgICAgQVNTRVJUKGVsZW1lbnQubV90eXBlID09IEZvcm1E YXRhRWxlbWVudDo6VHlwZTo6RW5jb2RlZEJsb2IpOwogICAgICAgICBhZGRFbmNvZGVkQmxvYlRv U291cE1lc3NhZ2VCb2R5KG1lc3NhZ2UsIGVsZW1lbnQsIHRvdGFsQm9keVNpemUpOwogI2VuZGlm CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29y a1Jlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdv cmtSZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggYTM4Njk5ZWRjYmFjNmNkNTY1MjEwYjZiZWQxMGM1 MmVhOWNhNWVhZi4uOTMyNjJjNjY5ZDJjM2RmNTA0MGZhZWE3MTVmNjI3ODg1MWIyOWQwOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9h ZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3Vy Y2VMb2FkZXIuY3BwCkBAIC04NSw3ICs4NSw3IEBAIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6TmV0 d29ya1Jlc291cmNlTG9hZGVyKGNvbnN0IE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzCiAg ICAgaWYgKG1fcmVxdWVzdC5odHRwQm9keSgpKSB7CiAgICAgICAgIGNvbnN0IFZlY3RvcjxGb3Jt RGF0YUVsZW1lbnQ+JiBlbGVtZW50cyA9IG1fcmVxdWVzdC5odHRwQm9keSgpLT5lbGVtZW50cygp OwogICAgICAgICBmb3IgKHNpemVfdCBpID0gMCwgY291bnQgPSBlbGVtZW50cy5zaXplKCk7IGkg PCBjb3VudDsgKytpKSB7Ci0gICAgICAgICAgICBpZiAoZWxlbWVudHNbaV0ubV90eXBlID09IEZv cm1EYXRhRWxlbWVudDo6ZW5jb2RlZEJsb2IpIHsKKyAgICAgICAgICAgIGlmIChlbGVtZW50c1tp XS5tX3R5cGUgPT0gRm9ybURhdGFFbGVtZW50OjpUeXBlOjpFbmNvZGVkQmxvYikgewogICAgICAg ICAgICAgICAgIFZlY3RvcjxSZWZQdHI8U2FuZGJveEV4dGVuc2lvbj4+IGJsb2JFbGVtZW50RXh0 ZW5zaW9ucyA9IE5ldHdvcmtCbG9iUmVnaXN0cnk6OnNoYXJlZCgpLnNhbmRib3hFeHRlbnNpb25z KGVsZW1lbnRzW2ldLm1fdXJsKTsKICAgICAgICAgICAgICAgICBtX3JlcXVlc3RCb2R5U2FuZGJv eEV4dGVuc2lvbnMuYXBwZW5kVmVjdG9yKGJsb2JFbGVtZW50RXh0ZW5zaW9ucyk7CiAgICAgICAg ICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmV0d29yay9OZXR3b3Jr UmVzb3VyY2VMb2FkUGFyYW1ldGVycy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmV0d29y ay9OZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5jcHAKaW5kZXggMmNlNTYyYWRmNmU0YWU5 YWJiMmUwZDZlOTIzNWE2YjhmMjUxN2VlYS4uY2M2ZTM1ZmY5Njg5ODkxYzJhNTNiMjQ2OTY3OWYz YjYwMmQ1MDY4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvTmV0 d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9OZXR3b3JrL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmNwcApAQCAtNjksNyArNjks NyBAQCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzOjplbmNvZGUoSVBDOjpBcmd1 bWVudEVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAgICAgICAgIGNvbnN0IFZlY3RvcjxGb3JtRGF0 YUVsZW1lbnQ+JiBlbGVtZW50cyA9IHJlcXVlc3QuaHR0cEJvZHkoKS0+ZWxlbWVudHMoKTsKICAg ICAgICAgc2l6ZV90IGZpbGVDb3VudCA9IDA7CiAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwLCBj b3VudCA9IGVsZW1lbnRzLnNpemUoKTsgaSA8IGNvdW50OyArK2kpIHsKLSAgICAgICAgICAgIGlm IChlbGVtZW50c1tpXS5tX3R5cGUgPT0gRm9ybURhdGFFbGVtZW50OjplbmNvZGVkRmlsZSkKKyAg ICAgICAgICAgIGlmIChlbGVtZW50c1tpXS5tX3R5cGUgPT0gRm9ybURhdGFFbGVtZW50OjpUeXBl OjpFbmNvZGVkRmlsZSkKICAgICAgICAgICAgICAgICArK2ZpbGVDb3VudDsKICAgICAgICAgfQog CkBAIC03OCw3ICs3OCw3IEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6OmVu Y29kZShJUEM6OkFyZ3VtZW50RW5jb2RlciYgZW5jb2RlcikgY29uc3QKICAgICAgICAgc2l6ZV90 IGV4dGVuc2lvbkluZGV4ID0gMDsKICAgICAgICAgZm9yIChzaXplX3QgaSA9IDAsIGNvdW50ID0g ZWxlbWVudHMuc2l6ZSgpOyBpIDwgY291bnQ7ICsraSkgewogICAgICAgICAgICAgY29uc3QgRm9y bURhdGFFbGVtZW50JiBlbGVtZW50ID0gZWxlbWVudHNbaV07Ci0gICAgICAgICAgICBpZiAoZWxl bWVudC5tX3R5cGUgPT0gRm9ybURhdGFFbGVtZW50OjplbmNvZGVkRmlsZSkgeworICAgICAgICAg ICAgaWYgKGVsZW1lbnQubV90eXBlID09IEZvcm1EYXRhRWxlbWVudDo6VHlwZTo6RW5jb2RlZEZp bGUpIHsKICAgICAgICAgICAgICAgICBjb25zdCBTdHJpbmcmIHBhdGggPSBlbGVtZW50Lm1fc2hv dWxkR2VuZXJhdGVGaWxlID8gZWxlbWVudC5tX2dlbmVyYXRlZEZpbGVuYW1lIDogZWxlbWVudC5t X2ZpbGVuYW1lOwogICAgICAgICAgICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRs ZShwYXRoLCBTYW5kYm94RXh0ZW5zaW9uOjpSZWFkT25seSwgcmVxdWVzdEJvZHlTYW5kYm94RXh0 ZW5zaW9uc1tleHRlbnNpb25JbmRleCsrXSk7CiAgICAgICAgICAgICB9Cg==