232380 2021-10-27 07:54:12 -0700 JavaScript URL result should be treated as UTF-8 bytes 2021-10-27 12:06:21 -0700 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 232334 1 cdumez cdumez achristensen beidson darin ews-watchlist ggaren japhet sam webkit-bug-importer youennf oldest_to_newest 1809256 0 cdumez 2021-10-27 07:54:12 -0700 JavaScript URL result should be treated as UTF-8 bytes: - https://github.com/whatwg/html/pull/6781 1809258 1 442591 cdumez 2021-10-27 08:10:08 -0700 Created attachment 442591 Patch 1809298 2 442591 darin 2021-10-27 10:06:39 -0700 Comment on attachment 442591 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=442591&action=review > Source/WebCore/loader/DocumentWriter.cpp:80 > + setEncoding("UTF-8"_s, false); Ah, false. So much better than true. (Why I like enumerations, I guess?) > Source/WebCore/loader/DocumentWriter.cpp:96 > + if (DocumentParser* parser = m_frame->document()->parser()) { > + auto utf8Source = source.utf8(); > + parser->appendBytes(*this, reinterpret_cast<const uint8_t*>(utf8Source.data()), utf8Source.length()); > + } If this is performance-critical, and all-ASCII is common, and the string is likely in 8-bit, then we could consider a fast path for that case. Or even come up with an alternative to String::utf8 that doesn’t allocate and free memory. Likely, though, it’s not important to optimize. 1809308 3 cdumez 2021-10-27 10:20:39 -0700 (In reply to Darin Adler from comment #2) > Comment on attachment 442591 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=442591&action=review > > > Source/WebCore/loader/DocumentWriter.cpp:80 > > + setEncoding("UTF-8"_s, false); > > Ah, false. So much better than true. (Why I like enumerations, I guess?) Yes, it is a pre-existing issue but I'll replace with an enum class. > > > Source/WebCore/loader/DocumentWriter.cpp:96 > > + if (DocumentParser* parser = m_frame->document()->parser()) { > > + auto utf8Source = source.utf8(); > > + parser->appendBytes(*this, reinterpret_cast<const uint8_t*>(utf8Source.data()), utf8Source.length()); > > + } > > If this is performance-critical, and all-ASCII is common, and the string is > likely in 8-bit, then we could consider a fast path for that case. Or even > come up with an alternative to String::utf8 that doesn’t allocate and free > memory. > > Likely, though, it’s not important to optimize. I doubt this is worth optimizing at this point. 1809328 4 442608 cdumez 2021-10-27 11:05:56 -0700 Created attachment 442608 Patch 1809366 5 ews-feeder 2021-10-27 12:05:53 -0700 Committed r284934 (243604@main): <https://commits.webkit.org/243604@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442608. 1809367 6 webkit-bug-importer 2021-10-27 12:06:21 -0700 <rdar://problem/84721697> 442591 2021-10-27 08:10:08 -0700 2021-10-27 11:05:54 -0700 Patch bug-232380-20211027081007.patch text/plain 5300 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0OTIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjIxN2JjMjBlOGE1OGE3 NWYzZWRjYjY1NjRjOWI2MmJlYTBjZTA3ZS4uYTU1NzBjYzk2M2Y2YmI2Y2JlOTdiYzJkZWY4NmUx MzhmYjQwNWMwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTEwLTI3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgSmF2YVNjcmlwdCBVUkwgcmVz dWx0IHNob3VsZCBiZSB0cmVhdGVkIGFzIFVURi04IGJ5dGVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIzODAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBKYXZhU2NyaXB0IFVSTCByZXN1bHQgc2hvdWxk IGJlIHRyZWF0ZWQgYXMgVVRGLTggYnl0ZXM6CisgICAgICAgIC0gaHR0cHM6Ly9naXRodWIuY29t L3doYXR3Zy9odG1sL3B1bGwvNjc4MQorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgcmViYXNlbGlu ZWQgZXhpc3RpbmcgdGVzdC4KKworICAgICAgICAqIGxvYWRlci9Eb2N1bWVudFdyaXRlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudFdyaXRlcjo6cmVwbGFjZURvY3VtZW50V2l0aFJl c3VsdE9mRXhlY3V0aW5nSmF2YXNjcmlwdFVSTCk6CisKIDIwMjEtMTAtMjcgIE1hcnRpbiBSb2Jp bnNvbiAgPG1yb2JpbnNvbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEVsaW1pbmF0ZSBkdXBsaWNh dGVkIHBsYXRmb3JtLXNwZWNpZmljIGNvZGUgaW4gU2Nyb2xsaW5nVHJlZVN0aWNreU5vZGUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFdyaXRlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRXcml0ZXIuY3BwCmluZGV4IGEwNjY2N2MxOTM0NDdh ZjBiNGI5NGYzZTAxN2FmNTdlYzYxNjQyZDguLmYzZjEzYTM2NGJjNTJmMzBiOTc5ZDIzMjZjMDFk ZWEwYjg2ZDZjOTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFdy aXRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50V3JpdGVyLmNwcApA QCAtNzcsNiArNzcsOCBAQCB2b2lkIERvY3VtZW50V3JpdGVyOjpyZXBsYWNlRG9jdW1lbnRXaXRo UmVzdWx0T2ZFeGVjdXRpbmdKYXZhc2NyaXB0VVJMKGNvbnN0IFN0cgogCiAgICAgYmVnaW4obV9m cmFtZS0+ZG9jdW1lbnQoKS0+dXJsKCksIHRydWUsIG93bmVyRG9jdW1lbnQpOwogCisgICAgc2V0 RW5jb2RpbmcoIlVURi04Il9zLCBmYWxzZSk7CisKICAgICAvLyBiZWdpbigpIG1pZ2h0IGZpcmUg YW4gdW5sb2FkIGV2ZW50LCB3aGljaCB3aWxsIHJlc3VsdCBpbiBhIHNpdHVhdGlvbiB3aGVyZSBu byBuZXcgZG9jdW1lbnQgaGFzIGJlZW4gYXR0YWNoZWQsCiAgICAgLy8gYW5kIHRoZSBvbGQgZG9j dW1lbnQgaGFzIGJlZW4gZGV0YWNoZWQuIFRoZXJlZm9yZSwgYmFpbCBvdXQgaWYgbm8gZG9jdW1l bnQgaXMgYXR0YWNoZWQuCiAgICAgaWYgKCFtX2ZyYW1lLT5kb2N1bWVudCgpKQpAQCAtODgsMTAg KzkwLDEwIEBAIHZvaWQgRG9jdW1lbnRXcml0ZXI6OnJlcGxhY2VEb2N1bWVudFdpdGhSZXN1bHRP ZkV4ZWN1dGluZ0phdmFzY3JpcHRVUkwoY29uc3QgU3RyCiAgICAgICAgICAgICBtX2ZyYW1lLT5k b2N1bWVudCgpLT5zZXRDb21wYXRpYmlsaXR5TW9kZShEb2N1bWVudENvbXBhdGliaWxpdHlNb2Rl OjpOb1F1aXJrc01vZGUpOwogICAgICAgICB9CiAKLSAgICAgICAgLy8gRklYTUU6IFRoaXMgc2hv dWxkIGNhbGwgRG9jdW1lbnRQYXJzZXI6OmFwcGVuZEJ5dGVzIGluc3RlYWQgb2YgYXBwZW5kCi0g ICAgICAgIC8vIHRvIHN1cHBvcnQgUmF3RGF0YURvY3VtZW50UGFyc2Vycy4KLSAgICAgICAgaWYg KERvY3VtZW50UGFyc2VyKiBwYXJzZXIgPSBtX2ZyYW1lLT5kb2N1bWVudCgpLT5wYXJzZXIoKSkK LSAgICAgICAgICAgIHBhcnNlci0+YXBwZW5kKHNvdXJjZS5pbXBsKCkpOworICAgICAgICBpZiAo RG9jdW1lbnRQYXJzZXIqIHBhcnNlciA9IG1fZnJhbWUtPmRvY3VtZW50KCktPnBhcnNlcigpKSB7 CisgICAgICAgICAgICBhdXRvIHV0ZjhTb3VyY2UgPSBzb3VyY2UudXRmOCgpOworICAgICAgICAg ICAgcGFyc2VyLT5hcHBlbmRCeXRlcygqdGhpcywgcmVpbnRlcnByZXRfY2FzdDxjb25zdCB1aW50 OF90Kj4odXRmOFNvdXJjZS5kYXRhKCkpLCB1dGY4U291cmNlLmxlbmd0aCgpKTsKKyAgICAgICAg fQogICAgIH0KIAogICAgIGVuZCgpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv dzNjL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXgg NTE3NTU3MmJkZDYyMmJiZjhhMDdkMWJjOTkxNzUwM2Q1Mjc5NTc1Ny4uZjM3MDI1YjEzOTlmYWIz MTJjZjMxMDlmMjIyNjRjMmEwNWUzZGU2YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMTAtMjcgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxl LmNvbT4KKworICAgICAgICBKYXZhU2NyaXB0IFVSTCByZXN1bHQgc2hvdWxkIGJlIHRyZWF0ZWQg YXMgVVRGLTggYnl0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzMjM4MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFJlYmFzZWxpbmUgV1BUIHRlc3Qgbm93IHRoYXQgbW9yZSBjaGVja3MgYXJlIHBhc3Np bmcuIFRoZSByZW1haW5pbmcgZmFpbHVyZXMgYXJlIGR1ZSB0byB0aGUgZmFjdCB0aGF0IHdlIGln bm9yZSB0aGUgSmF2YVNjcmlwdCBVUkwgcmVzdWx0CisgICAgICAgIHdoZW4gdGhlIFVSTCBpcyBz ZXQgYXMgaHJlZiBvbiBhbiBhbmNob3IgKGFzIG9wcG9zZWQgdG8gdGhlIHNyYyBvZiBhbiBpZnJh bWUpLiBUaGlzIHdpbGwgYmUgYWRkcmVzc2VkIHNlcGFyYXRlbHkuCisKKyAgICAgICAgKiB3ZWIt cGxhdGZvcm0tdGVzdHMvaHRtbC9icm93c2Vycy9icm93c2luZy10aGUtd2ViL25hdmlnYXRpbmct YWNyb3NzLWRvY3VtZW50cy9qYXZhc2NyaXB0LXVybC1yZXR1cm4tdmFsdWUtaGFuZGxpbmctZHlu YW1pYy1leHBlY3RlZC50eHQ6CisKIDIwMjEtMTAtMjYgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFw cGxlLmNvbT4KIAogICAgICAgICBDaGFuZ2luZyB0aGUgc3JjIGF0dHJpYnV0ZSBvZiB0aGUgPGlt Zz4gZWxlbWVudCBpbnNpZGUgYW4gSW1hZ2VEb2N1bWVudCBkb2VzIG5vdCB0cmlnZ2VyIGEgbG9h ZApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9odG1sL2Jyb3dzZXJzL2Jyb3dzaW5nLXRoZS13ZWIvbmF2aWdhdGluZy1hY3Jvc3MtZG9jdW1l bnRzL2phdmFzY3JpcHQtdXJsLXJldHVybi12YWx1ZS1oYW5kbGluZy1keW5hbWljLWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9i cm93c2Vycy9icm93c2luZy10aGUtd2ViL25hdmlnYXRpbmctYWNyb3NzLWRvY3VtZW50cy9qYXZh c2NyaXB0LXVybC1yZXR1cm4tdmFsdWUtaGFuZGxpbmctZHluYW1pYy1leHBlY3RlZC50eHQKaW5k ZXggZDI3MmI1OTQ2ZDIwNWM1MTIzODk3ZDA0NzFkY2U3MDljNGZlMTI5YS4uYzIyOWZlMTY3ZWY4 Y2E2MThhNjUxOWU4Zjc5NDA5MmMwYjQ2Y2Y4MSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL2Jyb3dzZXJzL2Jyb3dzaW5nLXRoZS13 ZWIvbmF2aWdhdGluZy1hY3Jvc3MtZG9jdW1lbnRzL2phdmFzY3JpcHQtdXJsLXJldHVybi12YWx1 ZS1oYW5kbGluZy1keW5hbWljLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvYnJvd3NlcnMvYnJvd3NpbmctdGhlLXdlYi9u YXZpZ2F0aW5nLWFjcm9zcy1kb2N1bWVudHMvamF2YXNjcmlwdC11cmwtcmV0dXJuLXZhbHVlLWhh bmRsaW5nLWR5bmFtaWMtZXhwZWN0ZWQudHh0CkBAIC0xLDEyICsxLDEyIEBACiAKLUZBSUwgMDA0 MSBzZXQgaW4gc3JjPSIiIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICJVVEYtOCIgYnV0IGdvdCAi d2luZG93cy0xMjUyIgorUEFTUyAwMDQxIHNldCBpbiBzcmM9IiIKIEZBSUwgMDA0MSBzZXQgaW4g aHJlZj0iIiB0YXJnZXRpbmcgYSBmcmFtZSBhbmQgY2xpY2tlZCBhc3NlcnRfZXF1YWxzOiBleHBl Y3RlZCAiQSIgYnV0IGdvdCAiIgotRkFJTCAwMDgwIDAwRkYgc2V0IGluIHNyYz0iIiBhc3NlcnRf ZXF1YWxzOiBleHBlY3RlZCAiVVRGLTgiIGJ1dCBnb3QgIndpbmRvd3MtMTI1MiIKK1BBU1MgMDA4 MCAwMEZGIHNldCBpbiBzcmM9IiIKIEZBSUwgMDA4MCAwMEZGIHNldCBpbiBocmVmPSIiIHRhcmdl dGluZyBhIGZyYW1lIGFuZCBjbGlja2VkIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICLCgMO/IiBi dXQgZ290ICIiCi1GQUlMIDAwODAgMDBGRiAwMTAwIHNldCBpbiBzcmM9IiIgYXNzZXJ0X2VxdWFs czogZXhwZWN0ZWQgIlVURi04IiBidXQgZ290ICJ3aW5kb3dzLTEyNTIiCitQQVNTIDAwODAgMDBG RiAwMTAwIHNldCBpbiBzcmM9IiIKIEZBSUwgMDA4MCAwMEZGIDAxMDAgc2V0IGluIGhyZWY9IiIg dGFyZ2V0aW5nIGEgZnJhbWUgYW5kIGNsaWNrZWQgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgIsKA w7/EgCIgYnV0IGdvdCAiIgotRkFJTCBEODNEIERFMEQgc2V0IGluIHNyYz0iIiBhc3NlcnRfZXF1 YWxzOiBleHBlY3RlZCAiVVRGLTgiIGJ1dCBnb3QgIndpbmRvd3MtMTI1MiIKK1BBU1MgRDgzRCBE RTBEIHNldCBpbiBzcmM9IiIKIEZBSUwgRDgzRCBERTBEIHNldCBpbiBocmVmPSIiIHRhcmdldGlu ZyBhIGZyYW1lIGFuZCBjbGlja2VkIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICLwn5iNIiBidXQg Z290ICIiCi1GQUlMIERFMEQgMDA0MSBzZXQgaW4gc3JjPSIiIGFzc2VydF9lcXVhbHM6IGV4cGVj dGVkICJcdWZmZmRBIiBidXQgZ290ICJVK2RlMGRBIgorUEFTUyBERTBEIDAwNDEgc2V0IGluIHNy Yz0iIgogRkFJTCBERTBEIDAwNDEgc2V0IGluIGhyZWY9IiIgdGFyZ2V0aW5nIGEgZnJhbWUgYW5k IGNsaWNrZWQgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgIlx1ZmZmZEEiIGJ1dCBnb3QgIiIKIAo= 442608 2021-10-27 11:05:56 -0700 2021-10-27 12:05:55 -0700 Patch bug-232380-20211027110555.patch text/plain 7522 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0OTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjIxN2JjMjBlOGE1OGE3 NWYzZWRjYjY1NjRjOWI2MmJlYTBjZTA3ZS4uZTMyOTNlMjQ1OThhY2VmOWMwZDRiNzE0YjQ3ZTc5 MWNlZjI3NDM0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTEwLTI3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgSmF2YVNjcmlwdCBVUkwgcmVz dWx0IHNob3VsZCBiZSB0cmVhdGVkIGFzIFVURi04IGJ5dGVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIzODAKKworICAgICAgICBSZXZpZXdlZCBi eSBEYXJpbiBBZGxlci4KKworICAgICAgICBKYXZhU2NyaXB0IFVSTCByZXN1bHQgc2hvdWxkIGJl IHRyZWF0ZWQgYXMgVVRGLTggYnl0ZXM6CisgICAgICAgIC0gaHR0cHM6Ly9naXRodWIuY29tL3do YXR3Zy9odG1sL3B1bGwvNjc4MQorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgcmViYXNlbGluZWQg ZXhpc3RpbmcgdGVzdC4KKworICAgICAgICAqIGxvYWRlci9Eb2N1bWVudFdyaXRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpEb2N1bWVudFdyaXRlcjo6cmVwbGFjZURvY3VtZW50V2l0aFJlc3Vs dE9mRXhlY3V0aW5nSmF2YXNjcmlwdFVSTCk6CisKIDIwMjEtMTAtMjcgIE1hcnRpbiBSb2JpbnNv biAgPG1yb2JpbnNvbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEVsaW1pbmF0ZSBkdXBsaWNhdGVk IHBsYXRmb3JtLXNwZWNpZmljIGNvZGUgaW4gU2Nyb2xsaW5nVHJlZVN0aWNreU5vZGUKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCmluZGV4IGE0M2Q0YmZhM2VjMmZiMzUy N2Y1ZGZiNjMxY2M1MWFkZjVlNGU0MGUuLjI3YzY0ZDc1YThhMmFiM2U0MGVlM2M0ODY2NDNjMTM5 MWNlMWFiZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcApAQCAt MTI4MCwxNyArMTI4MCwxNyBAQCB2b2lkIERvY3VtZW50TG9hZGVyOjpjb21taXREYXRhKGNvbnN0 IHVpbnQ4X3QqIGJ5dGVzLCBzaXplX3QgbGVuZ3RoKQogICAgICAgICAgICAgfQogICAgICAgICB9 CiAKLSAgICAgICAgYm9vbCB1c2VyQ2hvc2VuOworICAgICAgICBEb2N1bWVudFdyaXRlcjo6SXNF bmNvZGluZ1VzZXJDaG9zZW4gdXNlckNob3NlbjsKICAgICAgICAgU3RyaW5nIGVuY29kaW5nOwog ICAgICAgICBpZiAob3ZlcnJpZGVFbmNvZGluZygpLmlzTnVsbCgpKSB7Ci0gICAgICAgICAgICB1 c2VyQ2hvc2VuID0gZmFsc2U7CisgICAgICAgICAgICB1c2VyQ2hvc2VuID0gRG9jdW1lbnRXcml0 ZXI6OklzRW5jb2RpbmdVc2VyQ2hvc2VuOjpObzsKICAgICAgICAgICAgIGVuY29kaW5nID0gcmVz cG9uc2UoKS50ZXh0RW5jb2RpbmdOYW1lKCk7CiAjaWYgRU5BQkxFKFdFQl9BUkNISVZFKSB8fCBF TkFCTEUoTUhUTUwpCiAgICAgICAgICAgICBpZiAobV9hcmNoaXZlICYmIG1fYXJjaGl2ZS0+c2hv dWxkVXNlTWFpblJlc291cmNlRW5jb2RpbmcoKSkKICAgICAgICAgICAgICAgICBlbmNvZGluZyA9 IG1fYXJjaGl2ZS0+bWFpblJlc291cmNlKCktPnRleHRFbmNvZGluZygpOwogI2VuZGlmCiAgICAg ICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICB1c2VyQ2hvc2VuID0gdHJ1ZTsKKyAgICAgICAgICAg IHVzZXJDaG9zZW4gPSBEb2N1bWVudFdyaXRlcjo6SXNFbmNvZGluZ1VzZXJDaG9zZW46OlllczsK ICAgICAgICAgICAgIGVuY29kaW5nID0gb3ZlcnJpZGVFbmNvZGluZygpOwogICAgICAgICB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFdyaXRlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRXcml0ZXIuY3BwCmluZGV4IGEwNjY2N2MxOTM0 NDdhZjBiNGI5NGYzZTAxN2FmNTdlYzYxNjQyZDguLmIwNDZlZjBkZTIwNDhlZmQ0MzE5NzAyNjIy Yjk2YTdkZjJmZWFmYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVu dFdyaXRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50V3JpdGVyLmNw cApAQCAtNzcsNiArNzcsOCBAQCB2b2lkIERvY3VtZW50V3JpdGVyOjpyZXBsYWNlRG9jdW1lbnRX aXRoUmVzdWx0T2ZFeGVjdXRpbmdKYXZhc2NyaXB0VVJMKGNvbnN0IFN0cgogCiAgICAgYmVnaW4o bV9mcmFtZS0+ZG9jdW1lbnQoKS0+dXJsKCksIHRydWUsIG93bmVyRG9jdW1lbnQpOwogCisgICAg c2V0RW5jb2RpbmcoIlVURi04Il9zLCBJc0VuY29kaW5nVXNlckNob3Nlbjo6Tm8pOworCiAgICAg Ly8gYmVnaW4oKSBtaWdodCBmaXJlIGFuIHVubG9hZCBldmVudCwgd2hpY2ggd2lsbCByZXN1bHQg aW4gYSBzaXR1YXRpb24gd2hlcmUgbm8gbmV3IGRvY3VtZW50IGhhcyBiZWVuIGF0dGFjaGVkLAog ICAgIC8vIGFuZCB0aGUgb2xkIGRvY3VtZW50IGhhcyBiZWVuIGRldGFjaGVkLiBUaGVyZWZvcmUs IGJhaWwgb3V0IGlmIG5vIGRvY3VtZW50IGlzIGF0dGFjaGVkLgogICAgIGlmICghbV9mcmFtZS0+ ZG9jdW1lbnQoKSkKQEAgLTg4LDEwICs5MCwxMCBAQCB2b2lkIERvY3VtZW50V3JpdGVyOjpyZXBs YWNlRG9jdW1lbnRXaXRoUmVzdWx0T2ZFeGVjdXRpbmdKYXZhc2NyaXB0VVJMKGNvbnN0IFN0cgog ICAgICAgICAgICAgbV9mcmFtZS0+ZG9jdW1lbnQoKS0+c2V0Q29tcGF0aWJpbGl0eU1vZGUoRG9j dW1lbnRDb21wYXRpYmlsaXR5TW9kZTo6Tm9RdWlya3NNb2RlKTsKICAgICAgICAgfQogCi0gICAg ICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBjYWxsIERvY3VtZW50UGFyc2VyOjphcHBlbmRCeXRl cyBpbnN0ZWFkIG9mIGFwcGVuZAotICAgICAgICAvLyB0byBzdXBwb3J0IFJhd0RhdGFEb2N1bWVu dFBhcnNlcnMuCi0gICAgICAgIGlmIChEb2N1bWVudFBhcnNlciogcGFyc2VyID0gbV9mcmFtZS0+ ZG9jdW1lbnQoKS0+cGFyc2VyKCkpCi0gICAgICAgICAgICBwYXJzZXItPmFwcGVuZChzb3VyY2Uu aW1wbCgpKTsKKyAgICAgICAgaWYgKERvY3VtZW50UGFyc2VyKiBwYXJzZXIgPSBtX2ZyYW1lLT5k b2N1bWVudCgpLT5wYXJzZXIoKSkgeworICAgICAgICAgICAgYXV0byB1dGY4U291cmNlID0gc291 cmNlLnV0ZjgoKTsKKyAgICAgICAgICAgIHBhcnNlci0+YXBwZW5kQnl0ZXMoKnRoaXMsIHJlaW50 ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDhfdCo+KHV0ZjhTb3VyY2UuZGF0YSgpKSwgdXRmOFNvdXJj ZS5sZW5ndGgoKSk7CisgICAgICAgIH0KICAgICB9CiAKICAgICBlbmQoKTsKQEAgLTMwNiwxMCAr MzA4LDEwIEBAIHZvaWQgRG9jdW1lbnRXcml0ZXI6OmVuZCgpCiAgICAgbV9wYXJzZXIgPSBudWxs cHRyOwogfQogCi12b2lkIERvY3VtZW50V3JpdGVyOjpzZXRFbmNvZGluZyhjb25zdCBTdHJpbmcm IG5hbWUsIGJvb2wgdXNlckNob3NlbikKK3ZvaWQgRG9jdW1lbnRXcml0ZXI6OnNldEVuY29kaW5n KGNvbnN0IFN0cmluZyYgbmFtZSwgSXNFbmNvZGluZ1VzZXJDaG9zZW4gaXNVc2VyQ2hvc2VuKQog ewogICAgIG1fZW5jb2RpbmcgPSBuYW1lOwotICAgIG1fZW5jb2RpbmdXYXNDaG9zZW5CeVVzZXIg PSB1c2VyQ2hvc2VuOworICAgIG1fZW5jb2RpbmdXYXNDaG9zZW5CeVVzZXIgPSBpc1VzZXJDaG9z ZW4gPT0gSXNFbmNvZGluZ1VzZXJDaG9zZW46OlllczsKIH0KIAogdm9pZCBEb2N1bWVudFdyaXRl cjo6c2V0RnJhbWUoRnJhbWUmIGZyYW1lKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL0RvY3VtZW50V3JpdGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRXcml0 ZXIuaAppbmRleCA3MGZkMjBjMTM3M2FjMGRjOWI0NDQ5NTRjM2EyMDQwNmYyMWI4YzgwLi4wNzE3 MmM5NzM5ZWI1NzM1YmM4MWY4ZGVmMmZiOWIyODVjMjU0ZDBiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRXcml0ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRG9jdW1lbnRXcml0ZXIuaApAQCAtNTMsNyArNTMsOCBAQCBwdWJsaWM6CiAKICAgICB2b2lk IHNldEZyYW1lKEZyYW1lJik7CiAKLSAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldEVuY29kaW5n KGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGJvb2wgdXNlckNob3Nlbik7CisgICAgZW51bSBjbGFz cyBJc0VuY29kaW5nVXNlckNob3NlbiA6IGJvb2wgeyBObywgWWVzIH07CisgICAgV0VCQ09SRV9F WFBPUlQgdm9pZCBzZXRFbmNvZGluZyhjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBJc0VuY29kaW5n VXNlckNob3Nlbik7CiAKICAgICBjb25zdCBTdHJpbmcmIG1pbWVUeXBlKCkgY29uc3QgeyByZXR1 cm4gbV9taW1lVHlwZTsgfQogICAgIHZvaWQgc2V0TUlNRVR5cGUoY29uc3QgU3RyaW5nJiB0eXBl KSB7IG1fbWltZVR5cGUgPSB0eXBlOyB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRl ZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRl eCA1MTc1NTcyYmRkNjIyYmJmOGEwN2QxYmM5OTE3NTAzZDUyNzk1NzU3Li41MGNlZGE0YmQ2ODQ3 NzliMmM3MTdiNTU4ZWUyYTNiNTY1N2YzOTQ3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBv cnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMS0xMC0yNyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBw bGUuY29tPgorCisgICAgICAgIEphdmFTY3JpcHQgVVJMIHJlc3VsdCBzaG91bGQgYmUgdHJlYXRl ZCBhcyBVVEYtOCBieXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjMyMzgwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAg ICAgICAgUmViYXNlbGluZSBXUFQgdGVzdCBub3cgdGhhdCBtb3JlIGNoZWNrcyBhcmUgcGFzc2lu Zy4gVGhlIHJlbWFpbmluZyBmYWlsdXJlcyBhcmUgZHVlIHRvIHRoZSBmYWN0IHRoYXQgd2UgaWdu b3JlIHRoZSBKYXZhU2NyaXB0IFVSTCByZXN1bHQKKyAgICAgICAgd2hlbiB0aGUgVVJMIGlzIHNl dCBhcyBocmVmIG9uIGFuIGFuY2hvciAoYXMgb3Bwb3NlZCB0byB0aGUgc3JjIG9mIGFuIGlmcmFt ZSkuIFRoaXMgd2lsbCBiZSBhZGRyZXNzZWQgc2VwYXJhdGVseS4KKworICAgICAgICAqIHdlYi1w bGF0Zm9ybS10ZXN0cy9odG1sL2Jyb3dzZXJzL2Jyb3dzaW5nLXRoZS13ZWIvbmF2aWdhdGluZy1h Y3Jvc3MtZG9jdW1lbnRzL2phdmFzY3JpcHQtdXJsLXJldHVybi12YWx1ZS1oYW5kbGluZy1keW5h bWljLWV4cGVjdGVkLnR4dDoKKwogMjAyMS0xMC0yNiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBw bGUuY29tPgogCiAgICAgICAgIENoYW5naW5nIHRoZSBzcmMgYXR0cmlidXRlIG9mIHRoZSA8aW1n PiBlbGVtZW50IGluc2lkZSBhbiBJbWFnZURvY3VtZW50IGRvZXMgbm90IHRyaWdnZXIgYSBsb2Fk CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2h0bWwvYnJvd3NlcnMvYnJvd3NpbmctdGhlLXdlYi9uYXZpZ2F0aW5nLWFjcm9zcy1kb2N1bWVu dHMvamF2YXNjcmlwdC11cmwtcmV0dXJuLXZhbHVlLWhhbmRsaW5nLWR5bmFtaWMtZXhwZWN0ZWQu dHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL2Jy b3dzZXJzL2Jyb3dzaW5nLXRoZS13ZWIvbmF2aWdhdGluZy1hY3Jvc3MtZG9jdW1lbnRzL2phdmFz Y3JpcHQtdXJsLXJldHVybi12YWx1ZS1oYW5kbGluZy1keW5hbWljLWV4cGVjdGVkLnR4dAppbmRl eCBkMjcyYjU5NDZkMjA1YzUxMjM4OTdkMDQ3MWRjZTcwOWM0ZmUxMjlhLi5jMjI5ZmUxNjdlZjhj YTYxOGE2NTE5ZThmNzk0MDkyYzBiNDZjZjgxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvYnJvd3NlcnMvYnJvd3NpbmctdGhlLXdl Yi9uYXZpZ2F0aW5nLWFjcm9zcy1kb2N1bWVudHMvamF2YXNjcmlwdC11cmwtcmV0dXJuLXZhbHVl LWhhbmRsaW5nLWR5bmFtaWMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9icm93c2Vycy9icm93c2luZy10aGUtd2ViL25h dmlnYXRpbmctYWNyb3NzLWRvY3VtZW50cy9qYXZhc2NyaXB0LXVybC1yZXR1cm4tdmFsdWUtaGFu ZGxpbmctZHluYW1pYy1leHBlY3RlZC50eHQKQEAgLTEsMTIgKzEsMTIgQEAKIAotRkFJTCAwMDQx IHNldCBpbiBzcmM9IiIgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgIlVURi04IiBidXQgZ290ICJ3 aW5kb3dzLTEyNTIiCitQQVNTIDAwNDEgc2V0IGluIHNyYz0iIgogRkFJTCAwMDQxIHNldCBpbiBo cmVmPSIiIHRhcmdldGluZyBhIGZyYW1lIGFuZCBjbGlja2VkIGFzc2VydF9lcXVhbHM6IGV4cGVj dGVkICJBIiBidXQgZ290ICIiCi1GQUlMIDAwODAgMDBGRiBzZXQgaW4gc3JjPSIiIGFzc2VydF9l cXVhbHM6IGV4cGVjdGVkICJVVEYtOCIgYnV0IGdvdCAid2luZG93cy0xMjUyIgorUEFTUyAwMDgw IDAwRkYgc2V0IGluIHNyYz0iIgogRkFJTCAwMDgwIDAwRkYgc2V0IGluIGhyZWY9IiIgdGFyZ2V0 aW5nIGEgZnJhbWUgYW5kIGNsaWNrZWQgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgIsKAw78iIGJ1 dCBnb3QgIiIKLUZBSUwgMDA4MCAwMEZGIDAxMDAgc2V0IGluIHNyYz0iIiBhc3NlcnRfZXF1YWxz OiBleHBlY3RlZCAiVVRGLTgiIGJ1dCBnb3QgIndpbmRvd3MtMTI1MiIKK1BBU1MgMDA4MCAwMEZG IDAxMDAgc2V0IGluIHNyYz0iIgogRkFJTCAwMDgwIDAwRkYgMDEwMCBzZXQgaW4gaHJlZj0iIiB0 YXJnZXRpbmcgYSBmcmFtZSBhbmQgY2xpY2tlZCBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAiwoDD v8SAIiBidXQgZ290ICIiCi1GQUlMIEQ4M0QgREUwRCBzZXQgaW4gc3JjPSIiIGFzc2VydF9lcXVh bHM6IGV4cGVjdGVkICJVVEYtOCIgYnV0IGdvdCAid2luZG93cy0xMjUyIgorUEFTUyBEODNEIERF MEQgc2V0IGluIHNyYz0iIgogRkFJTCBEODNEIERFMEQgc2V0IGluIGhyZWY9IiIgdGFyZ2V0aW5n IGEgZnJhbWUgYW5kIGNsaWNrZWQgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgIvCfmI0iIGJ1dCBn b3QgIiIKLUZBSUwgREUwRCAwMDQxIHNldCBpbiBzcmM9IiIgYXNzZXJ0X2VxdWFsczogZXhwZWN0 ZWQgIlx1ZmZmZEEiIGJ1dCBnb3QgIlUrZGUwZEEiCitQQVNTIERFMEQgMDA0MSBzZXQgaW4gc3Jj PSIiCiBGQUlMIERFMEQgMDA0MSBzZXQgaW4gaHJlZj0iIiB0YXJnZXRpbmcgYSBmcmFtZSBhbmQg Y2xpY2tlZCBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAiXHVmZmZkQSIgYnV0IGdvdCAiIgogCg==