216108 2020-09-02 16:42:26 -0700 TextDecoder should ignore byte-order-mark like other browsers and spec 2020-09-03 09:59:27 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen annevk cdumez darin esprehn+autocc ews-watchlist kangil.han mmaxfield webkit-bug-importer ysuzuki oldest_to_newest 1685057 0 achristensen 2020-09-02 16:42:26 -0700 TextDecoder should ignore byte-order-mark like other browsers and spec 1685058 1 407831 achristensen 2020-09-02 16:43:01 -0700 Created attachment 407831 Patch 1685091 2 ap 2020-09-02 18:10:32 -0700 Is this a dupe of bug 169858 or a dupe of bug 203832? Both, I guess. 1685120 3 achristensen 2020-09-02 20:06:55 -0700 *** Bug 169858 has been marked as a duplicate of this bug. *** 1685122 4 achristensen 2020-09-02 20:07:20 -0700 *** Bug 203832 has been marked as a duplicate of this bug. *** 1685151 5 407864 achristensen 2020-09-02 21:19:33 -0700 Created attachment 407864 Patch 1685294 6 407864 achristensen 2020-09-03 09:37:24 -0700 Comment on attachment 407864 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=407864&action=review > Source/WebCore/dom/TextDecoder.cpp:72 > + if (stream && length < bytesNeededForFullBOMIgnoreCheck()) > + return WaitForMoreBOMBytes::Yes; I also need to check if the bytes start with what may become a byte order mark here. If they're other bytes, I need to return WaitForMoreBOMBytes::No 1685305 7 407864 darin 2020-09-03 09:57:58 -0700 Comment on attachment 407864 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=407864&action=review >> Source/WebCore/dom/TextDecoder.cpp:72 >> + return WaitForMoreBOMBytes::Yes; > > I also need to check if the bytes start with what may become a byte order mark here. If they're other bytes, I need to return WaitForMoreBOMBytes::No I guess the function would have a name like isBOMPrefix. 1685306 8 achristensen 2020-09-03 09:58:03 -0700 http://trac.webkit.org/r266528 1685307 9 webkit-bug-importer 2020-09-03 09:59:27 -0700 <rdar://problem/68285403> 407831 2020-09-02 16:43:01 -0700 2020-09-02 21:19:32 -0700 Patch bug-216108-20200902164300.patch text/plain 4073 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2NDY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWI5YmQ5YTg1NjM4OTMx ZjgwZjQ4MTcyZTYyOTY5NjMyNDI5OTdhZC4uNTI2MTY0MGQ1N2NiYzVjY2MwNGE2OTBiNmVkYzUz NjVkNmM0NzY2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA5LTAyICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVGV4dERl Y29kZXIgc2hvdWxkIGlnbm9yZSBieXRlLW9yZGVyLW1hcmsgbGlrZSBvdGhlciBicm93c2VycyBh bmQgc3BlYworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjE2MTA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Q292ZXJlZCBieSBuZXdseSBwYXNzaW5nIHdlYiBwbGF0Zm9ybSB0ZXN0cy4KKworICAgICAgICAq IGRvbS9UZXh0RGVjb2Rlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0RGVjb2Rlcjo6aWdu b3JlQk9NSWZOZWNlc3NhcnkpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dERlY29kZXI6OmRlY29k ZSk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0RGVjb2Rlcjo6cHJlcGVuZEJPTUlmTmVjZXNzYXJ5 KTogRGVsZXRlZC4KKyAgICAgICAgKiBkb20vVGV4dERlY29kZXIuaDoKKwogMjAyMC0wOS0wMiAg QWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEFs bG93IGRpcmVjdCBjcmVhdGlvbiBvZiByZXBsYWNlbWVudCBjb2RlYwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvZG9tL1RleHREZWNvZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9UZXh0 RGVjb2Rlci5jcHAKaW5kZXggNWFlNWQ3OWQ3ODA5OTQ5NTUzNWNjMGU4ODI5ZWY3YTNkMWYxYzhi ZC4uYzEyM2Q4ODM1YzYzZTAwNjYxZmY3ZWRjOWU3ZjM2MjNkMTZkYjljMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvZG9tL1RleHREZWNvZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9k b20vVGV4dERlY29kZXIuY3BwCkBAIC01MCw2ICs1MCw5IEBAIFRleHREZWNvZGVyOjpUZXh0RGVj b2Rlcihjb25zdCBjaGFyKiBsYWJlbCwgT3B0aW9ucyBvcHRpb25zKQogCiB2b2lkIFRleHREZWNv ZGVyOjppZ25vcmVCT01JZk5lY2Vzc2FyeShjb25zdCB1aW50OF90KiYgZGF0YSwgc2l6ZV90JiBs ZW5ndGgpCiB7CisgICAgaWYgKG1fYm9tU2VlbiB8fCBtX29wdGlvbnMuaWdub3JlQk9NKQorICAg ICAgICByZXR1cm47CisKICAgICBjb25zdCB1aW50OF90IHV0ZjhCT01CeXRlc1szXSA9IHsweEVG LCAweEJCLCAweEJGfTsKICAgICBjb25zdCB1aW50OF90IHV0ZjE2QkVCT01CeXRlc1syXSA9IHsw eEZFLCAweEZGfTsKICAgICBjb25zdCB1aW50OF90IHV0ZjE2TEVCT01CeXRlc1syXSA9IHsweEZG LCAweEZFfTsKQEAgLTc0LDE2ICs3Nyw3IEBAIHZvaWQgVGV4dERlY29kZXI6Omlnbm9yZUJPTUlm TmVjZXNzYXJ5KGNvbnN0IHVpbnQ4X3QqJiBkYXRhLCBzaXplX3QmIGxlbmd0aCkKICAgICAgICAg ZGF0YSArPSBzaXplb2YodXRmMTZMRUJPTUJ5dGVzKTsKICAgICAgICAgbGVuZ3RoIC09IHNpemVv Zih1dGYxNkxFQk9NQnl0ZXMpOwogICAgIH0KLX0KLQotU3RyaW5nIFRleHREZWNvZGVyOjpwcmVw ZW5kQk9NSWZOZWNlc3NhcnkoY29uc3QgU3RyaW5nJiBkZWNvZGVkKQotewotICAgIGlmIChtX2hh c0RlY29kZWQgfHwgIW1fb3B0aW9ucy5pZ25vcmVCT00pCi0gICAgICAgIHJldHVybiBkZWNvZGVk OwotICAgIGNvbnN0IFVDaGFyIHV0ZjE2QkVCT01bMl0gPSB7MHhGRUZGLCAnXDAnfTsKLQotICAg IC8vIEZJWE1FOiBNYWtlIFRleHRDb2RlYzo6ZGVjb2RlIHRha2UgYSBmbGFnIGZvciBwcmVwZW5k aW5nIEJPTSBzbyB3ZSBkb24ndCBuZWVkIHRvIGRvIHRoaXMgZXh0cmEgYWxsb2NhdGlvbiBhbmQg Y29weS4KLSAgICByZXR1cm4gbWFrZVN0cmluZyh1dGYxNkJFQk9NLCBkZWNvZGVkKTsKKyAgICBt X2JvbVNlZW4gPSB0cnVlOwogfQogCiBzdGF0aWMgc2l6ZV90IGNvZGVVbml0Qnl0ZVNpemUoY29u c3QgVGV4dEVuY29kaW5nJiBlbmNvZGluZykKQEAgLTEwMiw2ICs5Niw5IEBAIEV4Y2VwdGlvbk9y PFN0cmluZz4gVGV4dERlY29kZXI6OmRlY29kZShPcHRpb25hbDxCdWZmZXJTb3VyY2U6OlZhcmlh bnRUeXBlPiBpbnB1CiAgICAgICAgIGxlbmd0aCA9IGlucHV0QnVmZmVyLT5sZW5ndGgoKTsKICAg ICB9CiAKKyAgICBpZiAoIW9wdGlvbnMuc3RyZWFtKQorICAgICAgICBtX2JvbVNlZW4gPSBmYWxz ZTsKKwogICAgIGlnbm9yZUJPTUlmTmVjZXNzYXJ5KGRhdGEsIGxlbmd0aCk7CiAKICAgICBpZiAo bV9idWZmZXIuc2l6ZSgpKSB7CkBAIC0xMTcsNyArMTE0LDcgQEAgRXhjZXB0aW9uT3I8U3RyaW5n PiBUZXh0RGVjb2Rlcjo6ZGVjb2RlKE9wdGlvbmFsPEJ1ZmZlclNvdXJjZTo6VmFyaWFudFR5cGU+ IGlucHUKICAgICBjb25zdCBjaGFyKiBjaGFyRGF0YSA9IHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3Qg Y2hhcio+KGRhdGEpOwogICAgIFN0cmluZyByZXN1bHQ7CiAgICAgaWYgKCFzYXdFcnJvcikKLSAg ICAgICAgcmVzdWx0ID0gcHJlcGVuZEJPTUlmTmVjZXNzYXJ5KG1fdGV4dEVuY29kaW5nLmRlY29k ZShjaGFyRGF0YSwgbGVuZ3RoLCBzdG9wT25FcnJvciwgc2F3RXJyb3IpKTsKKyAgICAgICAgcmVz dWx0ID0gbV90ZXh0RW5jb2RpbmcuZGVjb2RlKGNoYXJEYXRhLCBsZW5ndGgsIHN0b3BPbkVycm9y LCBzYXdFcnJvcik7CiAKICAgICBpZiAoc2F3RXJyb3IpIHsKICAgICAgICAgaWYgKG9wdGlvbnMu c3RyZWFtKSB7CkBAIC0xMjcsMTIgKzEyNCwxMSBAQCBFeGNlcHRpb25PcjxTdHJpbmc+IFRleHRE ZWNvZGVyOjpkZWNvZGUoT3B0aW9uYWw8QnVmZmVyU291cmNlOjpWYXJpYW50VHlwZT4gaW5wdQog ICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgaWYgKG1fb3B0aW9ucy5mYXRhbCkKICAgICAg ICAgICAgICAgICByZXR1cm4gRXhjZXB0aW9uIHsgVHlwZUVycm9yIH07Ci0gICAgICAgICAgICBy ZXN1bHQgPSBwcmVwZW5kQk9NSWZOZWNlc3NhcnkobV90ZXh0RW5jb2RpbmcuZGVjb2RlKGNoYXJE YXRhLCBsZW5ndGgpKTsKKyAgICAgICAgICAgIHJlc3VsdCA9IG1fdGV4dEVuY29kaW5nLmRlY29k ZShjaGFyRGF0YSwgbGVuZ3RoKTsKICAgICAgICAgfQogICAgIH0gZWxzZQogICAgICAgICBtX2J1 ZmZlci5jbGVhcigpOwogCi0gICAgbV9oYXNEZWNvZGVkID0gdHJ1ZTsKICAgICByZXR1cm4gcmVz dWx0OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vVGV4dERlY29kZXIuaCBi L1NvdXJjZS9XZWJDb3JlL2RvbS9UZXh0RGVjb2Rlci5oCmluZGV4IDlkNGMxNWQ2OGIwNTNhYzFj ODgxYzRlNzBlMjJiMmI5ODU4NmNjMDAuLmQ5MmQ0M2Q5ZGY2MDM5OTUyNWJkOGQyODNkYTE2OTFk Y2FhZjY4MDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9UZXh0RGVjb2Rlci5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9UZXh0RGVjb2Rlci5oCkBAIC01MCwxMiArNTAsMTEgQEAg cHVibGljOgogICAgIEV4Y2VwdGlvbk9yPFN0cmluZz4gZGVjb2RlKE9wdGlvbmFsPEJ1ZmZlclNv dXJjZTo6VmFyaWFudFR5cGU+LCBEZWNvZGVPcHRpb25zKTsKIAogcHJpdmF0ZToKLSAgICBTdHJp bmcgcHJlcGVuZEJPTUlmTmVjZXNzYXJ5KGNvbnN0IFN0cmluZyYpOwogICAgIHZvaWQgaWdub3Jl Qk9NSWZOZWNlc3NhcnkoY29uc3QgdWludDhfdComIGRhdGEsIHNpemVfdCYgbGVuZ3RoKTsKICAg ICBUZXh0RGVjb2Rlcihjb25zdCBjaGFyKiwgT3B0aW9ucyk7CiAgICAgVGV4dEVuY29kaW5nIG1f dGV4dEVuY29kaW5nOwogICAgIE9wdGlvbnMgbV9vcHRpb25zOwotICAgIGJvb2wgbV9oYXNEZWNv ZGVkIHsgZmFsc2UgfTsKKyAgICBib29sIG1fYm9tU2VlbiB7IGZhbHNlIH07CiAgICAgVmVjdG9y PHVpbnQ4X3Q+IG1fYnVmZmVyOwogfTsKIAo= 407864 2020-09-02 21:19:33 -0700 2020-09-02 21:27:16 -0700 Patch bug-216108-20200902211933.patch text/plain 10051 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2NDY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWI5YmQ5YTg1NjM4OTMx ZjgwZjQ4MTcyZTYyOTY5NjMyNDI5OTdhZC4uNTI2MTY0MGQ1N2NiYzVjY2MwNGE2OTBiNmVkYzUz NjVkNmM0NzY2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA5LTAyICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVGV4dERl Y29kZXIgc2hvdWxkIGlnbm9yZSBieXRlLW9yZGVyLW1hcmsgbGlrZSBvdGhlciBicm93c2VycyBh bmQgc3BlYworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjE2MTA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Q292ZXJlZCBieSBuZXdseSBwYXNzaW5nIHdlYiBwbGF0Zm9ybSB0ZXN0cy4KKworICAgICAgICAq IGRvbS9UZXh0RGVjb2Rlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0RGVjb2Rlcjo6aWdu b3JlQk9NSWZOZWNlc3NhcnkpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dERlY29kZXI6OmRlY29k ZSk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0RGVjb2Rlcjo6cHJlcGVuZEJPTUlmTmVjZXNzYXJ5 KTogRGVsZXRlZC4KKyAgICAgICAgKiBkb20vVGV4dERlY29kZXIuaDoKKwogMjAyMC0wOS0wMiAg QWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEFs bG93IGRpcmVjdCBjcmVhdGlvbiBvZiByZXBsYWNlbWVudCBjb2RlYwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvZG9tL1RleHREZWNvZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9UZXh0 RGVjb2Rlci5jcHAKaW5kZXggNWFlNWQ3OWQ3ODA5OTQ5NTUzNWNjMGU4ODI5ZWY3YTNkMWYxYzhi ZC4uNjZiNjUyY2UwZDZlOTc3YTdmYzAyMTU5ZWJjNjlkOGFkZjc3ZGYzMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvZG9tL1RleHREZWNvZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9k b20vVGV4dERlY29kZXIuY3BwCkBAIC00OCwxMSArNDgsMjggQEAgVGV4dERlY29kZXI6OlRleHRE ZWNvZGVyKGNvbnN0IGNoYXIqIGxhYmVsLCBPcHRpb25zIG9wdGlvbnMpCiB7CiB9CiAKLXZvaWQg VGV4dERlY29kZXI6Omlnbm9yZUJPTUlmTmVjZXNzYXJ5KGNvbnN0IHVpbnQ4X3QqJiBkYXRhLCBz aXplX3QmIGxlbmd0aCkKK2NvbnN0ZXhwciB1aW50OF90IHV0ZjhCT01CeXRlc1szXSB7IDB4RUYs IDB4QkIsIDB4QkYgfTsKK2NvbnN0ZXhwciB1aW50OF90IHV0ZjE2QkVCT01CeXRlc1syXSB7IDB4 RkUsIDB4RkYgfTsKK2NvbnN0ZXhwciB1aW50OF90IHV0ZjE2TEVCT01CeXRlc1syXSB7IDB4RkYs IDB4RkUgfTsKKworc2l6ZV90IFRleHREZWNvZGVyOjpieXRlc05lZWRlZEZvckZ1bGxCT01JZ25v cmVDaGVjaygpIGNvbnN0Cit7CisgICAgaWYgKG1fdGV4dEVuY29kaW5nID09IFVURjhFbmNvZGlu ZygpKQorICAgICAgICByZXR1cm4gc2l6ZW9mKHV0ZjhCT01CeXRlcyk7CisgICAgaWYgKG1fdGV4 dEVuY29kaW5nID09IFVURjE2QmlnRW5kaWFuRW5jb2RpbmcoKSkKKyAgICAgICAgcmV0dXJuIHNp emVvZih1dGYxNkJFQk9NQnl0ZXMpOworICAgIGlmIChtX3RleHRFbmNvZGluZyA9PSBVVEYxNkxp dHRsZUVuZGlhbkVuY29kaW5nKCkpCisgICAgICAgIHJldHVybiBzaXplb2YodXRmMTZMRUJPTUJ5 dGVzKTsKKyAgICByZXR1cm4gMDsKK30KKworYXV0byBUZXh0RGVjb2Rlcjo6aWdub3JlQk9NSWZO ZWNlc3NhcnkoY29uc3QgdWludDhfdComIGRhdGEsIHNpemVfdCYgbGVuZ3RoLCBib29sIHN0cmVh bSkgLT4gV2FpdEZvck1vcmVCT01CeXRlcwogewotICAgIGNvbnN0IHVpbnQ4X3QgdXRmOEJPTUJ5 dGVzWzNdID0gezB4RUYsIDB4QkIsIDB4QkZ9OwotICAgIGNvbnN0IHVpbnQ4X3QgdXRmMTZCRUJP TUJ5dGVzWzJdID0gezB4RkUsIDB4RkZ9OwotICAgIGNvbnN0IHVpbnQ4X3QgdXRmMTZMRUJPTUJ5 dGVzWzJdID0gezB4RkYsIDB4RkV9OworICAgIGlmIChtX2JvbUlnbm9yZWRJZk5lY2Vzc2FyeSB8 fCBtX29wdGlvbnMuaWdub3JlQk9NKQorICAgICAgICByZXR1cm4gV2FpdEZvck1vcmVCT01CeXRl czo6Tm87CisKKyAgICBpZiAoc3RyZWFtICYmIGxlbmd0aCA8IGJ5dGVzTmVlZGVkRm9yRnVsbEJP TUlnbm9yZUNoZWNrKCkpCisgICAgICAgIHJldHVybiBXYWl0Rm9yTW9yZUJPTUJ5dGVzOjpZZXM7 CiAKICAgICBpZiAobV90ZXh0RW5jb2RpbmcgPT0gVVRGOEVuY29kaW5nKCkKICAgICAgICAgJiYg bGVuZ3RoID49IHNpemVvZih1dGY4Qk9NQnl0ZXMpCkBAIC03NCwxNiArOTEsOCBAQCB2b2lkIFRl eHREZWNvZGVyOjppZ25vcmVCT01JZk5lY2Vzc2FyeShjb25zdCB1aW50OF90KiYgZGF0YSwgc2l6 ZV90JiBsZW5ndGgpCiAgICAgICAgIGRhdGEgKz0gc2l6ZW9mKHV0ZjE2TEVCT01CeXRlcyk7CiAg ICAgICAgIGxlbmd0aCAtPSBzaXplb2YodXRmMTZMRUJPTUJ5dGVzKTsKICAgICB9Ci19Ci0KLVN0 cmluZyBUZXh0RGVjb2Rlcjo6cHJlcGVuZEJPTUlmTmVjZXNzYXJ5KGNvbnN0IFN0cmluZyYgZGVj b2RlZCkKLXsKLSAgICBpZiAobV9oYXNEZWNvZGVkIHx8ICFtX29wdGlvbnMuaWdub3JlQk9NKQot ICAgICAgICByZXR1cm4gZGVjb2RlZDsKLSAgICBjb25zdCBVQ2hhciB1dGYxNkJFQk9NWzJdID0g ezB4RkVGRiwgJ1wwJ307Ci0KLSAgICAvLyBGSVhNRTogTWFrZSBUZXh0Q29kZWM6OmRlY29kZSB0 YWtlIGEgZmxhZyBmb3IgcHJlcGVuZGluZyBCT00gc28gd2UgZG9uJ3QgbmVlZCB0byBkbyB0aGlz IGV4dHJhIGFsbG9jYXRpb24gYW5kIGNvcHkuCi0gICAgcmV0dXJuIG1ha2VTdHJpbmcodXRmMTZC RUJPTSwgZGVjb2RlZCk7CisgICAgbV9ib21JZ25vcmVkSWZOZWNlc3NhcnkgPSB0cnVlOworICAg IHJldHVybiBXYWl0Rm9yTW9yZUJPTUJ5dGVzOjpObzsKIH0KIAogc3RhdGljIHNpemVfdCBjb2Rl VW5pdEJ5dGVTaXplKGNvbnN0IFRleHRFbmNvZGluZyYgZW5jb2RpbmcpCkBAIC0xMDIsMTIgKzEx MSwyMiBAQCBFeGNlcHRpb25PcjxTdHJpbmc+IFRleHREZWNvZGVyOjpkZWNvZGUoT3B0aW9uYWw8 QnVmZmVyU291cmNlOjpWYXJpYW50VHlwZT4gaW5wdQogICAgICAgICBsZW5ndGggPSBpbnB1dEJ1 ZmZlci0+bGVuZ3RoKCk7CiAgICAgfQogCi0gICAgaWdub3JlQk9NSWZOZWNlc3NhcnkoZGF0YSwg bGVuZ3RoKTsKKyAgICBpZiAoIW9wdGlvbnMuc3RyZWFtKQorICAgICAgICBtX2JvbUlnbm9yZWRJ Zk5lY2Vzc2FyeSA9IGZhbHNlOwogCisgICAgYm9vbCBhbHJlYWR5QnVmZmVyZWQgPSBmYWxzZTsK ICAgICBpZiAobV9idWZmZXIuc2l6ZSgpKSB7CiAgICAgICAgIG1fYnVmZmVyLmFwcGVuZChkYXRh LCBsZW5ndGgpOwogICAgICAgICBkYXRhID0gbV9idWZmZXIuZGF0YSgpOwogICAgICAgICBsZW5n dGggPSBtX2J1ZmZlci5zaXplKCk7CisgICAgICAgIGFscmVhZHlCdWZmZXJlZCA9IHRydWU7Cisg ICAgfQorCisgICAgaWYgKGlnbm9yZUJPTUlmTmVjZXNzYXJ5KGRhdGEsIGxlbmd0aCwgb3B0aW9u cy5zdHJlYW0pID09IFdhaXRGb3JNb3JlQk9NQnl0ZXM6OlllcykgeworICAgICAgICBBU1NFUlQo b3B0aW9ucy5zdHJlYW0pOworICAgICAgICBpZiAoIWFscmVhZHlCdWZmZXJlZCkKKyAgICAgICAg ICAgIG1fYnVmZmVyLmFwcGVuZChkYXRhLCBsZW5ndGgpOworICAgICAgICByZXR1cm4gU3RyaW5n KCk7CiAgICAgfQogCiAgICAgY29uc3QgYm9vbCBzdG9wT25FcnJvciA9IHRydWU7CkBAIC0xMTcs NyArMTM2LDcgQEAgRXhjZXB0aW9uT3I8U3RyaW5nPiBUZXh0RGVjb2Rlcjo6ZGVjb2RlKE9wdGlv bmFsPEJ1ZmZlclNvdXJjZTo6VmFyaWFudFR5cGU+IGlucHUKICAgICBjb25zdCBjaGFyKiBjaGFy RGF0YSA9IHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KGRhdGEpOwogICAgIFN0cmluZyBy ZXN1bHQ7CiAgICAgaWYgKCFzYXdFcnJvcikKLSAgICAgICAgcmVzdWx0ID0gcHJlcGVuZEJPTUlm TmVjZXNzYXJ5KG1fdGV4dEVuY29kaW5nLmRlY29kZShjaGFyRGF0YSwgbGVuZ3RoLCBzdG9wT25F cnJvciwgc2F3RXJyb3IpKTsKKyAgICAgICAgcmVzdWx0ID0gbV90ZXh0RW5jb2RpbmcuZGVjb2Rl KGNoYXJEYXRhLCBsZW5ndGgsIHN0b3BPbkVycm9yLCBzYXdFcnJvcik7CiAKICAgICBpZiAoc2F3 RXJyb3IpIHsKICAgICAgICAgaWYgKG9wdGlvbnMuc3RyZWFtKSB7CkBAIC0xMjcsMTIgKzE0Niwx MSBAQCBFeGNlcHRpb25PcjxTdHJpbmc+IFRleHREZWNvZGVyOjpkZWNvZGUoT3B0aW9uYWw8QnVm ZmVyU291cmNlOjpWYXJpYW50VHlwZT4gaW5wdQogICAgICAgICB9IGVsc2UgewogICAgICAgICAg ICAgaWYgKG1fb3B0aW9ucy5mYXRhbCkKICAgICAgICAgICAgICAgICByZXR1cm4gRXhjZXB0aW9u IHsgVHlwZUVycm9yIH07Ci0gICAgICAgICAgICByZXN1bHQgPSBwcmVwZW5kQk9NSWZOZWNlc3Nh cnkobV90ZXh0RW5jb2RpbmcuZGVjb2RlKGNoYXJEYXRhLCBsZW5ndGgpKTsKKyAgICAgICAgICAg IHJlc3VsdCA9IG1fdGV4dEVuY29kaW5nLmRlY29kZShjaGFyRGF0YSwgbGVuZ3RoKTsKICAgICAg ICAgfQogICAgIH0gZWxzZQogICAgICAgICBtX2J1ZmZlci5jbGVhcigpOwogCi0gICAgbV9oYXNE ZWNvZGVkID0gdHJ1ZTsKICAgICByZXR1cm4gcmVzdWx0OwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vVGV4dERlY29kZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9UZXh0RGVj b2Rlci5oCmluZGV4IDlkNGMxNWQ2OGIwNTNhYzFjODgxYzRlNzBlMjJiMmI5ODU4NmNjMDAuLjA4 NWRmNjIwNDAyNWIyZGYxMzkyNzNkMDkwYWQ0OTRiMmYxYTMxOWIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9UZXh0RGVjb2Rlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9UZXh0 RGVjb2Rlci5oCkBAIC01MCwxMyArNTAsMTYgQEAgcHVibGljOgogICAgIEV4Y2VwdGlvbk9yPFN0 cmluZz4gZGVjb2RlKE9wdGlvbmFsPEJ1ZmZlclNvdXJjZTo6VmFyaWFudFR5cGU+LCBEZWNvZGVP cHRpb25zKTsKIAogcHJpdmF0ZToKLSAgICBTdHJpbmcgcHJlcGVuZEJPTUlmTmVjZXNzYXJ5KGNv bnN0IFN0cmluZyYpOwotICAgIHZvaWQgaWdub3JlQk9NSWZOZWNlc3NhcnkoY29uc3QgdWludDhf dComIGRhdGEsIHNpemVfdCYgbGVuZ3RoKTsKICAgICBUZXh0RGVjb2Rlcihjb25zdCBjaGFyKiwg T3B0aW9ucyk7CisKKyAgICBlbnVtIGNsYXNzIFdhaXRGb3JNb3JlQk9NQnl0ZXMgOiBib29sIHsg Tm8sIFllcyB9OworICAgIFdhaXRGb3JNb3JlQk9NQnl0ZXMgaWdub3JlQk9NSWZOZWNlc3Nhcnko Y29uc3QgdWludDhfdComIGRhdGEsIHNpemVfdCYgbGVuZ3RoLCBib29sIHN0cmVhbSk7CisgICAg c2l6ZV90IGJ5dGVzTmVlZGVkRm9yRnVsbEJPTUlnbm9yZUNoZWNrKCkgY29uc3Q7CisKICAgICBU ZXh0RW5jb2RpbmcgbV90ZXh0RW5jb2Rpbmc7CiAgICAgT3B0aW9ucyBtX29wdGlvbnM7Ci0gICAg Ym9vbCBtX2hhc0RlY29kZWQgeyBmYWxzZSB9OwogICAgIFZlY3Rvcjx1aW50OF90PiBtX2J1ZmZl cjsKKyAgICBib29sIG1fYm9tSWdub3JlZElmTmVjZXNzYXJ5IHsgZmFsc2UgfTsKIH07CiAKIH0K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRU ZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IGRmMjZjN2ZlYjVjOThiOWFmNTk5NDBi MzRhOTAyOGZhM2MzZDIwZTQuLjBmNDQ5YTIwZDJlZTY4ZjkyYmYyMTk4YWEwNWYyYzhjNzc4ZGVi ODYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIv TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIw LTA5LTAyICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgVGV4dERlY29kZXIgc2hvdWxkIGlnbm9yZSBieXRlLW9yZGVyLW1hcmsgbGlrZSBvdGhl ciBicm93c2VycyBhbmQgc3BlYworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE2MTA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvZW5jb2Rpbmcvc3RyZWFtcy9kZWNvZGUt aWdub3JlLWJvbS5hbnktZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0 cy9lbmNvZGluZy90ZXh0ZGVjb2Rlci1pZ25vcmVib20uYW55LWV4cGVjdGVkLnR4dDoKKwogMjAy MC0wOS0wMiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAg ICAgICAgIEFsbG93IGRpcmVjdCBjcmVhdGlvbiBvZiByZXBsYWNlbWVudCBjb2RlYwpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9lbmNvZGlu Zy9zdHJlYW1zL2RlY29kZS1pZ25vcmUtYm9tLmFueS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2VuY29kaW5nL3N0cmVhbXMvZGVjb2Rl LWlnbm9yZS1ib20uYW55LWV4cGVjdGVkLnR4dAppbmRleCBhNjg0ODQwMjBlYmQxNGFkOTNhMjNi MTAwM2FlZGQ2MGMxOWUxNmNmLi45MjQ0MjA2OGY1YzMzNTgyODZmNDY1ZDYxOWNmOGZhZDcwZjlh OTNmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2VuY29kaW5nL3N0cmVhbXMvZGVjb2RlLWlnbm9yZS1ib20uYW55LWV4cGVjdGVkLnR4dAor KysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2VuY29kaW5n L3N0cmVhbXMvZGVjb2RlLWlnbm9yZS1ib20uYW55LWV4cGVjdGVkLnR4dApAQCAtMSwxNCArMSwx NCBAQAogCiBQQVNTIGlnbm9yZUJPTSBzaG91bGQgd29yayBmb3IgZW5jb2RpbmcgdXRmLTgsIHNw bGl0IGF0IGNoYXJhY3RlciAwIAotRkFJTCBpZ25vcmVCT00gc2hvdWxkIHdvcmsgZm9yIGVuY29k aW5nIHV0Zi04LCBzcGxpdCBhdCBjaGFyYWN0ZXIgMSBhc3NlcnRfZXF1YWxzOiBCT00gc2hvdWxk IGJlIHN0cmlwcGVkIGV4cGVjdGVkICJhYmMiIGJ1dCBnb3QgIu+7v2FiYyIKLUZBSUwgaWdub3Jl Qk9NIHNob3VsZCB3b3JrIGZvciBlbmNvZGluZyB1dGYtOCwgc3BsaXQgYXQgY2hhcmFjdGVyIDIg YXNzZXJ0X2VxdWFsczogQk9NIHNob3VsZCBiZSBzdHJpcHBlZCBleHBlY3RlZCAiYWJjIiBidXQg Z290ICLvu79hYmMiCitQQVNTIGlnbm9yZUJPTSBzaG91bGQgd29yayBmb3IgZW5jb2RpbmcgdXRm LTgsIHNwbGl0IGF0IGNoYXJhY3RlciAxIAorUEFTUyBpZ25vcmVCT00gc2hvdWxkIHdvcmsgZm9y IGVuY29kaW5nIHV0Zi04LCBzcGxpdCBhdCBjaGFyYWN0ZXIgMiAKIFBBU1MgaWdub3JlQk9NIHNo b3VsZCB3b3JrIGZvciBlbmNvZGluZyB1dGYtOCwgc3BsaXQgYXQgY2hhcmFjdGVyIDMgCiBQQVNT IGlnbm9yZUJPTSBzaG91bGQgd29yayBmb3IgZW5jb2RpbmcgdXRmLTE2bGUsIHNwbGl0IGF0IGNo YXJhY3RlciAwIAotRkFJTCBpZ25vcmVCT00gc2hvdWxkIHdvcmsgZm9yIGVuY29kaW5nIHV0Zi0x NmxlLCBzcGxpdCBhdCBjaGFyYWN0ZXIgMSBhc3NlcnRfZXF1YWxzOiBCT00gc2hvdWxkIGJlIHN0 cmlwcGVkIGV4cGVjdGVkICJhYmMiIGJ1dCBnb3QgIu+7v2FiYyIKK1BBU1MgaWdub3JlQk9NIHNo b3VsZCB3b3JrIGZvciBlbmNvZGluZyB1dGYtMTZsZSwgc3BsaXQgYXQgY2hhcmFjdGVyIDEgCiBQ QVNTIGlnbm9yZUJPTSBzaG91bGQgd29yayBmb3IgZW5jb2RpbmcgdXRmLTE2bGUsIHNwbGl0IGF0 IGNoYXJhY3RlciAyIAotRkFJTCBpZ25vcmVCT00gc2hvdWxkIHdvcmsgZm9yIGVuY29kaW5nIHV0 Zi0xNmxlLCBzcGxpdCBhdCBjaGFyYWN0ZXIgMyBhc3NlcnRfZXF1YWxzOiBCT00gc2hvdWxkIGJl IHByZXNlcnZlZCBleHBlY3RlZCAi77u/YWJjIiBidXQgZ290ICJhYmMiCitQQVNTIGlnbm9yZUJP TSBzaG91bGQgd29yayBmb3IgZW5jb2RpbmcgdXRmLTE2bGUsIHNwbGl0IGF0IGNoYXJhY3RlciAz IAogUEFTUyBpZ25vcmVCT00gc2hvdWxkIHdvcmsgZm9yIGVuY29kaW5nIHV0Zi0xNmJlLCBzcGxp dCBhdCBjaGFyYWN0ZXIgMCAKLUZBSUwgaWdub3JlQk9NIHNob3VsZCB3b3JrIGZvciBlbmNvZGlu ZyB1dGYtMTZiZSwgc3BsaXQgYXQgY2hhcmFjdGVyIDEgYXNzZXJ0X2VxdWFsczogQk9NIHNob3Vs ZCBiZSBzdHJpcHBlZCBleHBlY3RlZCAiYWJjIiBidXQgZ290ICLvu79hYmMiCitQQVNTIGlnbm9y ZUJPTSBzaG91bGQgd29yayBmb3IgZW5jb2RpbmcgdXRmLTE2YmUsIHNwbGl0IGF0IGNoYXJhY3Rl ciAxIAogUEFTUyBpZ25vcmVCT00gc2hvdWxkIHdvcmsgZm9yIGVuY29kaW5nIHV0Zi0xNmJlLCBz cGxpdCBhdCBjaGFyYWN0ZXIgMiAKLUZBSUwgaWdub3JlQk9NIHNob3VsZCB3b3JrIGZvciBlbmNv ZGluZyB1dGYtMTZiZSwgc3BsaXQgYXQgY2hhcmFjdGVyIDMgYXNzZXJ0X2VxdWFsczogQk9NIHNo b3VsZCBiZSBwcmVzZXJ2ZWQgZXhwZWN0ZWQgIu+7v2FiYyIgYnV0IGdvdCAiYWJjIgorUEFTUyBp Z25vcmVCT00gc2hvdWxkIHdvcmsgZm9yIGVuY29kaW5nIHV0Zi0xNmJlLCBzcGxpdCBhdCBjaGFy YWN0ZXIgMyAKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9lbmNvZGluZy90ZXh0ZGVjb2Rlci1pZ25vcmVib20uYW55LWV4cGVjdGVkLnR4 dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvZW5jb2Rpbmcv dGV4dGRlY29kZXItaWdub3JlYm9tLmFueS1leHBlY3RlZC50eHQKaW5kZXggZjE4Y2VkZjY3NDg5 OWI0MDg4ZmE3M2E0ZTFlMTFiYzA0NjA4YzZiMS4uNmFmNGM5M2U2ZmEyZWNiNjI0ODQzNTgzNTg4 Mzc4NzNkMTU0MDdmYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9lbmNvZGluZy90ZXh0ZGVjb2Rlci1pZ25vcmVib20uYW55LWV4cGVjdGVk LnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Vu Y29kaW5nL3RleHRkZWNvZGVyLWlnbm9yZWJvbS5hbnktZXhwZWN0ZWQudHh0CkBAIC0xLDYgKzEs NiBAQAogCi1GQUlMIEJPTSBpcyBpZ25vcmVkIGlmIGlnbm9yZUJPTSBvcHRpb24gaXMgc3BlY2lm aWVkOiB1dGYtOCBhc3NlcnRfZXF1YWxzOiB1dGYtODogQk9NIHNob3VsZCBiZSBwcmVzZW50IGlu IGRlY29kZWQgc3RyaW5nIGlmIGlnbm9yZWQgYnkgYSByZXVzZWQgZGVjb2RlciBleHBlY3RlZCAi 77u/YWJjIiBidXQgZ290ICJhYmMiCi1GQUlMIEJPTSBpcyBpZ25vcmVkIGlmIGlnbm9yZUJPTSBv cHRpb24gaXMgc3BlY2lmaWVkOiB1dGYtMTZsZSBhc3NlcnRfZXF1YWxzOiB1dGYtMTZsZTogQk9N IHNob3VsZCBiZSBwcmVzZW50IGluIGRlY29kZWQgc3RyaW5nIGlmIGlnbm9yZWQgYnkgYSByZXVz ZWQgZGVjb2RlciBleHBlY3RlZCAi77u/YWJjIiBidXQgZ290ICJhYmMiCi1GQUlMIEJPTSBpcyBp Z25vcmVkIGlmIGlnbm9yZUJPTSBvcHRpb24gaXMgc3BlY2lmaWVkOiB1dGYtMTZiZSBhc3NlcnRf ZXF1YWxzOiB1dGYtMTZiZTogQk9NIHNob3VsZCBiZSBwcmVzZW50IGluIGRlY29kZWQgc3RyaW5n IGlmIGlnbm9yZWQgYnkgYSByZXVzZWQgZGVjb2RlciBleHBlY3RlZCAi77u/YWJjIiBidXQgZ290 ICJhYmMiCitQQVNTIEJPTSBpcyBpZ25vcmVkIGlmIGlnbm9yZUJPTSBvcHRpb24gaXMgc3BlY2lm aWVkOiB1dGYtOCAKK1BBU1MgQk9NIGlzIGlnbm9yZWQgaWYgaWdub3JlQk9NIG9wdGlvbiBpcyBz cGVjaWZpZWQ6IHV0Zi0xNmxlIAorUEFTUyBCT00gaXMgaWdub3JlZCBpZiBpZ25vcmVCT00gb3B0 aW9uIGlzIHNwZWNpZmllZDogdXRmLTE2YmUgCiBQQVNTIFRoZSBpZ25vcmVCT00gYXR0cmlidXRl IG9mIFRleHREZWNvZGVyIAogCg==