226996 2021-06-14 16:24:46 -0700 [JSC] Workaround ICU uloc_addLikelySubtags / uloc_minimizeSubtags bugs 2021-06-15 17:11:54 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=35201 https://bugs.chromium.org/p/chromium/issues/detail?id=1166143 InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff ross.kirsling saam tzagallo webkit-bug-importer oldest_to_newest 1769596 0 ysuzuki 2021-06-14 16:24:46 -0700 [JSC] Workaround ICU uloc_addLikelySubtags / uloc_minimizeSubtags bugs 1769607 1 431384 ysuzuki 2021-06-14 16:36:03 -0700 Created attachment 431384 Patch 1769608 2 ysuzuki 2021-06-14 16:36:06 -0700 <rdar://problem/79250513> 1769644 3 431384 ross.kirsling 2021-06-14 17:27:51 -0700 Comment on attachment 431384 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=431384&action=review All of our ICU workaround code honestly makes me want to cry, but r=me. 😅 > Source/JavaScriptCore/ChangeLog:18 > + This is workaround, and still this workaround is not complete since we could have many variants. In that case, uloc_addLikelySubtags / uloc_minimizeSubtags > + still fails, and in that case, for now, we give up performing uloc_addLikelySubtags / uloc_minimizeSubtags. Fixing this needs to be > + done in ICU side. We should create a JIRA ticket for this. > JSTests/stress/intl-long-locale-id-maximize-minimize.js:6 > + const __v_16 = new Intl.Locale(`de-Latn-DE-u-cu-eur-em-default-hc-h23-ks-level1-lb-strict-lw-normal-ms-metric-nu-latn-rg-atzzzz-sd-atat1-ss-none-tz-atvie-va-posix`); Let's use less cryptic variable names. 1769654 4 431384 ysuzuki 2021-06-14 17:58:01 -0700 Comment on attachment 431384 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=431384&action=review Thanks! >> Source/JavaScriptCore/ChangeLog:18 >> + done in ICU side. > > We should create a JIRA ticket for this. Filed https://unicode-org.atlassian.net/browse/ICU-21639 >> JSTests/stress/intl-long-locale-id-maximize-minimize.js:6 >> + const __v_16 = new Intl.Locale(`de-Latn-DE-u-cu-eur-em-default-hc-h23-ks-level1-lb-strict-lw-normal-ms-metric-nu-latn-rg-atzzzz-sd-atat1-ss-none-tz-atvie-va-posix`); > > Let's use less cryptic variable names. Changed. 1769688 5 ysuzuki 2021-06-14 21:45:19 -0700 Committed r278859 (238803@main): <https://commits.webkit.org/238803@main> 431384 2021-06-14 16:36:03 -0700 2021-06-14 19:13:35 -0700 Patch bug-226996-20210614163602.patch text/plain 11064 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4ODI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAx YzhkYTU1NjQxOWMzMDI1ZWYwNzI0MTUwY2JhNGYxYmRjNjk0NWI1Li5mNGVlNDkzMTMyN2YzOGUz MGY3Yjk2OTI5YzExM2M0Y2ViMDdlYTI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOCBAQAorMjAyMS0wNi0xNCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIFdvcmthcm91bmQgSUNVIHVsb2NfYWRkTGlrZWx5U3VidGFncyAv IHVsb2NfbWluaW1pemVTdWJ0YWdzIGJ1Z3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyNjk5NgorICAgICAgICByZGFyOi8vNzkyNTA1MTMKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJQ1UgaGFzIGJ1Z3Mg dGhhdCB1bG9jX2FkZExpa2VseVN1YnRhZ3MgLyB1bG9jX21pbmltaXplU3VidGFncyBjYW5ub3Qg aGFuZGxlIHZlcnkgbG9uZyBsb2NhbGUgSUQgdGhhdCBleGNlZWRzIFVMT0NfRlVMTE5BTUVfQ0FQ QUNJVFksCisgICAgICAgIHdoaWxlIHRoZXNlIGZ1bmN0aW9ucyBjYW4gdGFrZSBhcmJpdHJhcnkg c2l6ZWQgYnVmZmVyIGZvciBvdXRwdXQuIFRoaXMgY2FuIGJlIGFjaGlldmVkIHNpbXBseSBieSAo MSkgYXR0YWNoaW5nIG1hbnkgdW5pY29kZSBleHRlbnNpb25zLAorICAgICAgICBvciAoMikgaGF2 aW5nIG1hbnkgdmFyaWFudHMuCisKKyAgICAgICAgSW4gdGhpcyBwYXRjaCwgd2UgYWRkIGEgd29y a2Fyb3VuZDogaWYgdWxvY19hZGRMaWtlbHlTdWJ0YWdzIC8gdWxvY19taW5pbWl6ZVN1YnRhZ3Mg ZmFpbGVkLCB3ZSBwZXJmb3JtIHRoZW0gd2l0aG91dCBoYXZpbmcgbG9jYWxlIElECisgICAgICAg IGtleXdvcmRzIHBhcnQuIEFmdGVyIHBlcmZvcm1pbmcgdGhlIG9wZXJhdGlvbnMsIHdlIGFwcGVu ZCB0aGVzZSBrZXl3b3JkcyBiYWNrLgorCisgICAgICAgIFRoaXMgaXMgd29ya2Fyb3VuZCwgYW5k IHN0aWxsIHRoaXMgd29ya2Fyb3VuZCBpcyBub3QgY29tcGxldGUgc2luY2Ugd2UgY291bGQgaGF2 ZSBtYW55IHZhcmlhbnRzLiBJbiB0aGF0IGNhc2UsIHVsb2NfYWRkTGlrZWx5U3VidGFncyAvIHVs b2NfbWluaW1pemVTdWJ0YWdzCisgICAgICAgIHN0aWxsIGZhaWxzLCBhbmQgaW4gdGhhdCBjYXNl LCBmb3Igbm93LCB3ZSBnaXZlIHVwIHBlcmZvcm1pbmcgdWxvY19hZGRMaWtlbHlTdWJ0YWdzIC8g dWxvY19taW5pbWl6ZVN1YnRhZ3MuIEZpeGluZyB0aGlzIG5lZWRzIHRvIGJlCisgICAgICAgIGRv bmUgaW4gSUNVIHNpZGUuCisKKyAgICAgICAgKiBydW50aW1lL0ludGxMb2NhbGUuY3BwOgorICAg ICAgICAoSlNDOjpJbnRsTG9jYWxlOjprZXl3b3JkVmFsdWUgY29uc3QpOgorICAgICAgICAoSlND OjpJbnRsTG9jYWxlOjptYXhpbWFsKToKKyAgICAgICAgKEpTQzo6SW50bExvY2FsZTo6bWluaW1h bCk6CisgICAgICAgIChKU0M6OkludGxMb2NhbGU6OmJhc2VOYW1lKToKKwogMjAyMS0wNi0xMyAg U2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KIAogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2NTc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9JbnRsTG9jYWxlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0ludGxMb2NhbGUuY3BwCmluZGV4IGYyMmFiYTA1NTE1ZmZmNTNkMGQwNjc5NTI0 NzJmM2UwOWM2Y2ZkODMuLmM4OGFkNzMxY2Y3MGUyNzIxMmUwNmYyMWUxMzQzMDFhZDg4YmM4YjYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxMb2NhbGUuY3Bw CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxMb2NhbGUuY3BwCkBAIC0y MDEsNyArMjAxLDcgQEAgU3RyaW5nIEludGxMb2NhbGU6OmtleXdvcmRWYWx1ZShBU0NJSUxpdGVy YWwga2V5LCBib29sIGlzQm9vbGVhbikgY29uc3QKICAgICBpZiAobmVlZHNUb0dyb3dUb1Byb2R1 Y2VDU3RyaW5nKHN0YXR1cykpIHsKICAgICAgICAgYnVmZmVyLmdyb3coYnVmZmVyTGVuZ3RoICsg MSk7CiAgICAgICAgIHN0YXR1cyA9IFVfWkVST19FUlJPUjsKLSAgICAgICAgdWxvY19nZXRLZXl3 b3JkVmFsdWUobV9sb2NhbGVJRC5kYXRhKCksIGtleS5jaGFyYWN0ZXJzKCksIGJ1ZmZlci5kYXRh KCksIGJ1ZmZlckxlbmd0aCArIDEsICZzdGF0dXMpOworICAgICAgICB1bG9jX2dldEtleXdvcmRW YWx1ZShtX2xvY2FsZUlELmRhdGEoKSwga2V5LmNoYXJhY3RlcnMoKSwgYnVmZmVyLmRhdGEoKSwg YnVmZmVyLnNpemUoKSwgJnN0YXR1cyk7CiAgICAgfQogICAgIEFTU0VSVChVX1NVQ0NFU1Moc3Rh dHVzKSk7CiAgICAgaWYgKGlzQm9vbGVhbikKQEAgLTMyMiwxNyArMzIyLDQ4IEBAIHZvaWQgSW50 bExvY2FsZTo6aW5pdGlhbGl6ZUxvY2FsZShKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBj b25zdCBTdHJpbmcmIHRhCiBjb25zdCBTdHJpbmcmIEludGxMb2NhbGU6Om1heGltYWwoKQogewog ICAgIGlmIChtX21heGltYWwuaXNOdWxsKCkpIHsKKyAgICAgICAgLy8gSUNVIGhhcyBhIHNlcmlv dXMgYnVnIHRoYXQgaXQgZmFpbHMgdG8gcGVyZm9ybSB1bG9jX2FkZExpa2VseVN1YnRhZ3Mgd2hl biB0aGUgaW5wdXQgbG9jYWxlSUQgaXMgbG9uZ2VyIHRoYW4gVUxPQ19GVUxMTkFNRV9DQVBBQ0lU WSwKKyAgICAgICAgLy8gYW5kIHRoYXQgY2FuIGJlIGFjaGlldmVkIGlmIHdlIGFkZCBtYW55IHVu aWNvZGUgZXh0ZW5zaW9ucy4gV2hpbGUgSUNVIG5lZWRzIHRvIGJlIGZpeGVkLCB3ZSB3b3JrLWFy b3VuZCB0aGlzIGJ1ZyBmb3Igbm93OiBXZSBwYXNzCisgICAgICAgIC8vIG5vbi1rZXl3b3JkIHBh cnQgb2YgSUNVIGxvY2FsZSBJRCBhbmQgbGF0ZXIsIGNvbmNhdGVuYXRlIGtleXdvcmQgcGFydCB0 byB0aGUgb3V0cHV0LgorICAgICAgICAvLyBub3RlIHRoYXQgSUNVIGxvY2FsZSBJRCBjb25zaXN0 cyBvZiBMYW5ndWFnZSwgU2NyaXB0LCBDb3VudHJ5ICh1bmljb2RlIGxhbmd1YWdlIHRhZydzIHJl Z2lvbi4KICAgICAgICAgVUVycm9yQ29kZSBzdGF0dXMgPSBVX1pFUk9fRVJST1I7CiAgICAgICAg IFZlY3RvcjxjaGFyLCAzMj4gYnVmZmVyKDMyKTsKICAgICAgICAgYXV0byBidWZmZXJMZW5ndGgg PSB1bG9jX2FkZExpa2VseVN1YnRhZ3MobV9sb2NhbGVJRC5kYXRhKCksIGJ1ZmZlci5kYXRhKCks IGJ1ZmZlci5zaXplKCksICZzdGF0dXMpOwogICAgICAgICBpZiAobmVlZHNUb0dyb3dUb1Byb2R1 Y2VDU3RyaW5nKHN0YXR1cykpIHsKICAgICAgICAgICAgIGJ1ZmZlci5ncm93KGJ1ZmZlckxlbmd0 aCArIDEpOwogICAgICAgICAgICAgc3RhdHVzID0gVV9aRVJPX0VSUk9SOwotICAgICAgICAgICAg dWxvY19hZGRMaWtlbHlTdWJ0YWdzKG1fbG9jYWxlSUQuZGF0YSgpLCBidWZmZXIuZGF0YSgpLCBi dWZmZXJMZW5ndGggKyAxLCAmc3RhdHVzKTsKKyAgICAgICAgICAgIHVsb2NfYWRkTGlrZWx5U3Vi dGFncyhtX2xvY2FsZUlELmRhdGEoKSwgYnVmZmVyLmRhdGEoKSwgYnVmZmVyLnNpemUoKSwgJnN0 YXR1cyk7CiAgICAgICAgIH0KLSAgICAgICAgQVNTRVJUKFVfU1VDQ0VTUyhzdGF0dXMpKTsKIAot ICAgICAgICBtX21heGltYWwgPSBsYW5ndWFnZVRhZ0ZvckxvY2FsZUlEKGJ1ZmZlci5kYXRhKCkp OworICAgICAgICBpZiAoVV9TVUNDRVNTKHN0YXR1cykpCisgICAgICAgICAgICBtX21heGltYWwg PSBsYW5ndWFnZVRhZ0ZvckxvY2FsZUlEKGJ1ZmZlci5kYXRhKCkpOworICAgICAgICBlbHNlIHsK KyAgICAgICAgICAgIHN0YXR1cyA9IFVfWkVST19FUlJPUjsKKyAgICAgICAgICAgIFZlY3Rvcjxj aGFyLCAzMj4gYmFzZU5hbWVJRDsKKyAgICAgICAgICAgIGF1dG8gYnVmZmVyTGVuZ3RoID0gdWxv Y19nZXRCYXNlTmFtZShtX2xvY2FsZUlELmRhdGEoKSwgYmFzZU5hbWVJRC5kYXRhKCksIGJhc2VO YW1lSUQuc2l6ZSgpLCAmc3RhdHVzKTsKKyAgICAgICAgICAgIGlmIChuZWVkc1RvR3Jvd1RvUHJv ZHVjZUNTdHJpbmcoc3RhdHVzKSkgeworICAgICAgICAgICAgICAgIGJhc2VOYW1lSUQuZ3Jvdyhi dWZmZXJMZW5ndGggKyAxKTsKKyAgICAgICAgICAgICAgICBzdGF0dXMgPSBVX1pFUk9fRVJST1I7 CisgICAgICAgICAgICAgICAgdWxvY19nZXRCYXNlTmFtZShtX2xvY2FsZUlELmRhdGEoKSwgYmFz ZU5hbWVJRC5kYXRhKCksIGJhc2VOYW1lSUQuc2l6ZSgpLCAmc3RhdHVzKTsKKyAgICAgICAgICAg IH0KKyAgICAgICAgICAgIEFTU0VSVChVX1NVQ0NFU1Moc3RhdHVzKSk7CisKKyAgICAgICAgICAg IFZlY3RvcjxjaGFyLCAzMj4gbWF4aW1hbDsKKyAgICAgICAgICAgIHN0YXR1cyA9IGNhbGxCdWZm ZXJQcm9kdWNpbmdGdW5jdGlvbih1bG9jX2FkZExpa2VseVN1YnRhZ3MsIGJhc2VOYW1lSUQuZGF0 YSgpLCBtYXhpbWFsKTsKKyAgICAgICAgICAgIC8vIFdlIGZhaWwgaWYsCisgICAgICAgICAgICAv LyAxLiB1bG9jX2FkZExpa2VseVN1YnRhZ3Mgc3RpbGwgZmFpbHMuCisgICAgICAgICAgICAvLyAy LiBOZXcgbWF4aW1hbCBsb2NhbGUgSUQgaW5jbHVkZXMgbmV3bHktYWRkZWQga2V5d29yZHMuCisg ICAgICAgICAgICBpZiAoIVVfU1VDQ0VTUyhzdGF0dXMpIHx8IG1heGltYWwuZmluZChVTE9DX0tF WVdPUkRfU0VQQVJBVE9SKSAhPSBub3RGb3VuZCkgeworICAgICAgICAgICAgICAgIG1fbWF4aW1h bCA9IHRvU3RyaW5nKCk7CisgICAgICAgICAgICAgICAgcmV0dXJuIG1fbWF4aW1hbDsKKyAgICAg ICAgICAgIH0KKworICAgICAgICAgICAgYXV0byBlbmRPZkxhbmd1YWdlU2NyaXB0UmVnaW9uVmFy aWFudCA9IFdURjo6ZmluZChtX2xvY2FsZUlELmRhdGEoKSwgbV9sb2NhbGVJRC5sZW5ndGgoKSwg VUxPQ19LRVlXT1JEX1NFUEFSQVRPUik7CisgICAgICAgICAgICBpZiAoZW5kT2ZMYW5ndWFnZVNj cmlwdFJlZ2lvblZhcmlhbnQgIT0gbm90Rm91bmQpCisgICAgICAgICAgICAgICAgbWF4aW1hbC5h cHBlbmRSYW5nZShtX2xvY2FsZUlELmRhdGEoKSArIGVuZE9mTGFuZ3VhZ2VTY3JpcHRSZWdpb25W YXJpYW50LCBtX2xvY2FsZUlELmRhdGEoKSArIG1fbG9jYWxlSUQubGVuZ3RoKCkpOworICAgICAg ICAgICAgbWF4aW1hbC5hcHBlbmQoJ1wwJyk7CisgICAgICAgICAgICBtX21heGltYWwgPSBsYW5n dWFnZVRhZ0ZvckxvY2FsZUlEKG1heGltYWwuZGF0YSgpKTsKKyAgICAgICAgfQogICAgIH0KICAg ICByZXR1cm4gbV9tYXhpbWFsOwogfQpAQCAtMzQxLDE3ICszNzIsNDggQEAgY29uc3QgU3RyaW5n JiBJbnRsTG9jYWxlOjptYXhpbWFsKCkKIGNvbnN0IFN0cmluZyYgSW50bExvY2FsZTo6bWluaW1h bCgpCiB7CiAgICAgaWYgKG1fbWluaW1hbC5pc051bGwoKSkgeworICAgICAgICAvLyBJQ1UgaGFz IGEgc2VyaW91cyBidWcgdGhhdCBpdCBmYWlscyB0byBwZXJmb3JtIHVsb2NfbWluaW1pemVTdWJ0 YWdzIHdoZW4gdGhlIGlucHV0IGxvY2FsZUlEIGlzIGxvbmdlciB0aGFuIFVMT0NfRlVMTE5BTUVf Q0FQQUNJVFksCisgICAgICAgIC8vIGFuZCB0aGF0IGNhbiBiZSBhY2hpZXZlZCBpZiB3ZSBhZGQg bWFueSB1bmljb2RlIGV4dGVuc2lvbnMuIFdoaWxlIElDVSBuZWVkcyB0byBiZSBmaXhlZCwgd2Ug d29yay1hcm91bmQgdGhpcyBidWcgZm9yIG5vdzogV2UgcGFzcworICAgICAgICAvLyBub24ta2V5 d29yZCBwYXJ0IG9mIElDVSBsb2NhbGUgSUQgYW5kIGxhdGVyLCBjb25jYXRlbmF0ZSBrZXl3b3Jk IHBhcnQgdG8gdGhlIG91dHB1dC4KKyAgICAgICAgLy8gbm90ZSB0aGF0IElDVSBsb2NhbGUgSUQg Y29uc2lzdHMgb2YgTGFuZ3VhZ2UsIFNjcmlwdCwgQ291bnRyeSAodW5pY29kZSBsYW5ndWFnZSB0 YWcncyByZWdpb24uCiAgICAgICAgIFVFcnJvckNvZGUgc3RhdHVzID0gVV9aRVJPX0VSUk9SOwog ICAgICAgICBWZWN0b3I8Y2hhciwgMzI+IGJ1ZmZlcigzMik7CiAgICAgICAgIGF1dG8gYnVmZmVy TGVuZ3RoID0gdWxvY19taW5pbWl6ZVN1YnRhZ3MobV9sb2NhbGVJRC5kYXRhKCksIGJ1ZmZlci5k YXRhKCksIGJ1ZmZlci5zaXplKCksICZzdGF0dXMpOwogICAgICAgICBpZiAobmVlZHNUb0dyb3dU b1Byb2R1Y2VDU3RyaW5nKHN0YXR1cykpIHsKICAgICAgICAgICAgIGJ1ZmZlci5ncm93KGJ1ZmZl ckxlbmd0aCArIDEpOwogICAgICAgICAgICAgc3RhdHVzID0gVV9aRVJPX0VSUk9SOwotICAgICAg ICAgICAgdWxvY19taW5pbWl6ZVN1YnRhZ3MobV9sb2NhbGVJRC5kYXRhKCksIGJ1ZmZlci5kYXRh KCksIGJ1ZmZlckxlbmd0aCArIDEsICZzdGF0dXMpOworICAgICAgICAgICAgdWxvY19taW5pbWl6 ZVN1YnRhZ3MobV9sb2NhbGVJRC5kYXRhKCksIGJ1ZmZlci5kYXRhKCksIGJ1ZmZlci5zaXplKCks ICZzdGF0dXMpOwogICAgICAgICB9Ci0gICAgICAgIEFTU0VSVChVX1NVQ0NFU1Moc3RhdHVzKSk7 CiAKLSAgICAgICAgbV9taW5pbWFsID0gbGFuZ3VhZ2VUYWdGb3JMb2NhbGVJRChidWZmZXIuZGF0 YSgpKTsKKyAgICAgICAgaWYgKFVfU1VDQ0VTUyhzdGF0dXMpKQorICAgICAgICAgICAgbV9taW5p bWFsID0gbGFuZ3VhZ2VUYWdGb3JMb2NhbGVJRChidWZmZXIuZGF0YSgpKTsKKyAgICAgICAgZWxz ZSB7CisgICAgICAgICAgICBzdGF0dXMgPSBVX1pFUk9fRVJST1I7CisgICAgICAgICAgICBWZWN0 b3I8Y2hhciwgMzI+IGJhc2VOYW1lSUQ7CisgICAgICAgICAgICBhdXRvIGJ1ZmZlckxlbmd0aCA9 IHVsb2NfZ2V0QmFzZU5hbWUobV9sb2NhbGVJRC5kYXRhKCksIGJhc2VOYW1lSUQuZGF0YSgpLCBi YXNlTmFtZUlELnNpemUoKSwgJnN0YXR1cyk7CisgICAgICAgICAgICBpZiAobmVlZHNUb0dyb3dU b1Byb2R1Y2VDU3RyaW5nKHN0YXR1cykpIHsKKyAgICAgICAgICAgICAgICBiYXNlTmFtZUlELmdy b3coYnVmZmVyTGVuZ3RoICsgMSk7CisgICAgICAgICAgICAgICAgc3RhdHVzID0gVV9aRVJPX0VS Uk9SOworICAgICAgICAgICAgICAgIHVsb2NfZ2V0QmFzZU5hbWUobV9sb2NhbGVJRC5kYXRhKCks IGJhc2VOYW1lSUQuZGF0YSgpLCBiYXNlTmFtZUlELnNpemUoKSwgJnN0YXR1cyk7CisgICAgICAg ICAgICB9CisgICAgICAgICAgICBBU1NFUlQoVV9TVUNDRVNTKHN0YXR1cykpOworCisgICAgICAg ICAgICBWZWN0b3I8Y2hhciwgMzI+IG1pbmltYWw7CisgICAgICAgICAgICBhdXRvIHN0YXR1cyA9 IGNhbGxCdWZmZXJQcm9kdWNpbmdGdW5jdGlvbih1bG9jX21pbmltaXplU3VidGFncywgYmFzZU5h bWVJRC5kYXRhKCksIG1pbmltYWwpOworICAgICAgICAgICAgLy8gV2UgZmFpbCBpZiwKKyAgICAg ICAgICAgIC8vIDEuIHVsb2NfbWluaW1pemVTdWJ0YWdzIHN0aWxsIGZhaWxzLgorICAgICAgICAg ICAgLy8gMi4gTmV3IG1pbmltYWwgbG9jYWxlIElEIGluY2x1ZGVzIG5ld2x5LWFkZGVkIGtleXdv cmRzLgorICAgICAgICAgICAgaWYgKCFVX1NVQ0NFU1Moc3RhdHVzKSB8fCBtaW5pbWFsLmZpbmQo VUxPQ19LRVlXT1JEX1NFUEFSQVRPUikgIT0gbm90Rm91bmQpIHsKKyAgICAgICAgICAgICAgICBt X21pbmltYWwgPSB0b1N0cmluZygpOworICAgICAgICAgICAgICAgIHJldHVybiBtX21pbmltYWw7 CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGF1dG8gZW5kT2ZMYW5ndWFnZVNjcmlwdFJl Z2lvblZhcmlhbnQgPSBXVEY6OmZpbmQobV9sb2NhbGVJRC5kYXRhKCksIG1fbG9jYWxlSUQubGVu Z3RoKCksIFVMT0NfS0VZV09SRF9TRVBBUkFUT1IpOworICAgICAgICAgICAgaWYgKGVuZE9mTGFu Z3VhZ2VTY3JpcHRSZWdpb25WYXJpYW50ICE9IG5vdEZvdW5kKQorICAgICAgICAgICAgICAgIG1p bmltYWwuYXBwZW5kUmFuZ2UobV9sb2NhbGVJRC5kYXRhKCkgKyBlbmRPZkxhbmd1YWdlU2NyaXB0 UmVnaW9uVmFyaWFudCwgbV9sb2NhbGVJRC5kYXRhKCkgKyBtX2xvY2FsZUlELmxlbmd0aCgpKTsK KyAgICAgICAgICAgIG1pbmltYWwuYXBwZW5kKCdcMCcpOworICAgICAgICAgICAgbV9taW5pbWFs ID0gbGFuZ3VhZ2VUYWdGb3JMb2NhbGVJRChtaW5pbWFsLmRhdGEoKSk7CisgICAgICAgIH0KICAg ICB9CiAgICAgcmV0dXJuIG1fbWluaW1hbDsKIH0KQEAgLTM3NCw3ICs0MzYsNyBAQCBjb25zdCBT dHJpbmcmIEludGxMb2NhbGU6OmJhc2VOYW1lKCkKICAgICAgICAgaWYgKG5lZWRzVG9Hcm93VG9Q cm9kdWNlQ1N0cmluZyhzdGF0dXMpKSB7CiAgICAgICAgICAgICBidWZmZXIuZ3JvdyhidWZmZXJM ZW5ndGggKyAxKTsKICAgICAgICAgICAgIHN0YXR1cyA9IFVfWkVST19FUlJPUjsKLSAgICAgICAg ICAgIHVsb2NfZ2V0QmFzZU5hbWUobV9sb2NhbGVJRC5kYXRhKCksIGJ1ZmZlci5kYXRhKCksIGJ1 ZmZlckxlbmd0aCArIDEsICZzdGF0dXMpOworICAgICAgICAgICAgdWxvY19nZXRCYXNlTmFtZSht X2xvY2FsZUlELmRhdGEoKSwgYnVmZmVyLmRhdGEoKSwgYnVmZmVyLnNpemUoKSwgJnN0YXR1cyk7 CiAgICAgICAgIH0KICAgICAgICAgQVNTRVJUKFVfU1VDQ0VTUyhzdGF0dXMpKTsKIApkaWZmIC0t Z2l0IGEvSlNUZXN0cy9DaGFuZ2VMb2cgYi9KU1Rlc3RzL0NoYW5nZUxvZwppbmRleCBjMjVlODI3 NTQwMzdhNjlkYjVkMWJlZWM0MWFiYzczOTE0ODEyNGJlLi4xZjUxN2IzMjE5OWVkZjRmOWI4YjU1 OGQ5ZGFlN2I3N2E0MTkwYWQzIDEwMDY0NAotLS0gYS9KU1Rlc3RzL0NoYW5nZUxvZworKysgYi9K U1Rlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA2LTE0ICBZdXN1a2UgU3V6 dWtpICA8eXN1enVraUBhcHBsZS5jb20+CisKKyAgICAgICAgW0pTQ10gV29ya2Fyb3VuZCBJQ1Ug dWxvY19hZGRMaWtlbHlTdWJ0YWdzIC8gdWxvY19taW5pbWl6ZVN1YnRhZ3MgYnVncworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2OTk2CisgICAgICAg IHJkYXI6Ly83OTI1MDUxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogc3RyZXNzL2ludGwtbG9uZy1sb2NhbGUtaWQtbWF4aW1pemUtbWluaW1pemUu anM6IEFkZGVkLgorICAgICAgICAoc2hvdWxkQmUpOgorICAgICAgICAodGhyb3cubmV3LkVycm9y KToKKwogMjAyMS0wNi0xMyAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KIAogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2NTc2CmRpZmYg LS1naXQgYS9KU1Rlc3RzL3N0cmVzcy9pbnRsLWxvbmctbG9jYWxlLWlkLW1heGltaXplLW1pbmlt aXplLmpzIGIvSlNUZXN0cy9zdHJlc3MvaW50bC1sb25nLWxvY2FsZS1pZC1tYXhpbWl6ZS1taW5p bWl6ZS5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi40OWU3YjYyYzUxY2UyZmRhOGEwMDE3NmZjNWViNWJiODQ4OGFj ZGIxCi0tLSAvZGV2L251bGwKKysrIGIvSlNUZXN0cy9zdHJlc3MvaW50bC1sb25nLWxvY2FsZS1p ZC1tYXhpbWl6ZS1taW5pbWl6ZS5qcwpAQCAtMCwwICsxLDIwIEBACitmdW5jdGlvbiBzaG91bGRC ZShhY3R1YWwsIGV4cGVjdGVkKSB7CisgICAgaWYgKGFjdHVhbCAhPT0gZXhwZWN0ZWQpCisgICAg ICAgIHRocm93IG5ldyBFcnJvcignYmFkIHZhbHVlOiAnICsgYWN0dWFsKTsKK30KK3sKKyAgICBj b25zdCBfX3ZfMTYgPSBuZXcgSW50bC5Mb2NhbGUoYGRlLUxhdG4tREUtdS1jdS1ldXItZW0tZGVm YXVsdC1oYy1oMjMta3MtbGV2ZWwxLWxiLXN0cmljdC1sdy1ub3JtYWwtbXMtbWV0cmljLW51LWxh dG4tcmctYXR6enp6LXNkLWF0YXQxLXNzLW5vbmUtdHotYXR2aWUtdmEtcG9zaXhgKTsKKyAgICBz aG91bGRCZShfX3ZfMTYubWluaW1pemUoKS50b1N0cmluZygpLCBgZGUtdS1jdS1ldXItZW0tZGVm YXVsdC1oYy1oMjMta3MtbGV2ZWwxLWxiLXN0cmljdC1sdy1ub3JtYWwtbXMtbWV0cmljLW51LWxh dG4tcmctYXR6enp6LXNkLWF0YXQxLXNzLW5vbmUtdHotYXR2aWUtdmEtcG9zaXhgKTsKK30KK3sK KyAgICBjb25zdCBfX3ZfMTYgPSBuZXcgSW50bC5Mb2NhbGUoYGRlLXUtY3UtZXVyLWVtLWRlZmF1 bHQtaGMtaDIzLWtzLWxldmVsMS1sYi1zdHJpY3QtbHctbm9ybWFsLW1zLW1ldHJpYy1udS1sYXRu LXJnLWF0enp6ei1zZC1hdGF0MS1zcy1ub25lLXR6LWF0dmllLXZhLXBvc2l4YCk7CisgICAgc2hv dWxkQmUoX192XzE2Lm1heGltaXplKCkudG9TdHJpbmcoKSwgYGRlLUxhdG4tREUtdS1jdS1ldXIt ZW0tZGVmYXVsdC1oYy1oMjMta3MtbGV2ZWwxLWxiLXN0cmljdC1sdy1ub3JtYWwtbXMtbWV0cmlj LW51LWxhdG4tcmctYXR6enp6LXNkLWF0YXQxLXNzLW5vbmUtdHotYXR2aWUtdmEtcG9zaXhgKTsK K30KK3sKKyAgICBjb25zdCBfX3ZfMTYgPSBuZXcgSW50bC5Mb2NhbGUoYGRlLXZhcmlhbnQwLXJv emFqLWJpc2tlLW5lZGlzLXZhcmlhbnQxLXZhcmlhbnQyLXZhcmlhbnQzLXZhcmlhbnQ0LXZhcmlh bnQ1LXZhcmlhbnQ2LXZhcmlhbnQ3LXZhcmlhbnQ4LXZhcmlhbnQ5LXZhcmlhbnRhLXZhcmlhbnRi LXZhcmlhbnRjLXZhcmlhbnRkLXZhcmlhbnRlLXZhcmlhbnRmLXZhcmlhbnRnLXZhcmlhbnRoLXZh cmlhbnRpLXZhcmlhbnRqLXZhcmlhbnRrYCk7CisgICAgc2hvdWxkQmUoX192XzE2Lm1heGltaXpl KCkudG9TdHJpbmcoKSwgYGRlYCk7Cit9Cit7CisgICAgY29uc3QgX192XzE2ID0gbmV3IEludGwu TG9jYWxlKGBkZS1MYXRuLURFLXJvemFqLWJpc2tlLW5lZGlzLXZhcmlhbnQwLXZhcmlhbnQxLXZh cmlhbnQyLXZhcmlhbnQzLXZhcmlhbnQ0LXZhcmlhbnQ1LXZhcmlhbnQ2LXZhcmlhbnQ3LXZhcmlh bnQ4LXZhcmlhbnQ5LXZhcmlhbnRhLXZhcmlhbnRiLXZhcmlhbnRjLXZhcmlhbnRkLXZhcmlhbnRl LXZhcmlhbnRmLXZhcmlhbnRnLXZhcmlhbnRoLXZhcmlhbnRpLXZhcmlhbnRqLXZhcmlhbnRrYCk7 CisgICAgc2hvdWxkQmUoX192XzE2Lm1pbmltaXplKCkudG9TdHJpbmcoKSwgYGRlLUxhdG4tREVg KTsKK30K