80815 2012-03-11 22:51:51 -0700 Use ICU C API instead of C++ API in LocalizedNumberICU 2012-03-12 01:38:28 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.gentoo.org/show_bug.cgi?id=407401 P2 Normal --- 78326 1 tkent tkent morrita webkit.review.bot oldest_to_newest 575948 0 tkent 2012-03-11 22:51:51 -0700 Because C++ API of ICU 4.8 is not upper-compatible with ICU 4.6. 575955 1 131285 tkent 2012-03-11 23:03:04 -0700 Created attachment 131285 Patch 575965 2 131285 morrita 2012-03-12 00:07:55 -0700 Comment on attachment 131285 Patch Looks good. 575996 3 131285 webkit.review.bot 2012-03-12 01:38:23 -0700 Comment on attachment 131285 Patch Clearing flags on attachment: 131285 Committed r110414: <http://trac.webkit.org/changeset/110414> 575997 4 webkit.review.bot 2012-03-12 01:38:28 -0700 All reviewed patches have been landed. Closing bug. 131285 2012-03-11 23:03:04 -0700 2012-03-12 01:38:23 -0700 Patch bug-80815-20120312150302.patch text/plain 13844 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwNDA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmJjNTFmNDJlNTU0Mzc5 OTZjNTEwYTI3NTc1NjliZDc2NzZmZTRjYi4uYWQ0NDYzNGE3ZTljMjM4OTM1NDkzMWMxNjcxMjJm YTgwMzc5MjZhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDEyLTAzLTExICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBVc2UgSUNVIEMgQVBJIGlu c3RlYWQgb2YgQysrIEFQSSBpbiBMb2NhbGl6ZWROdW1iZXJJQ1UKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwODE1CisgICAgICAgIGh0dHBzOi8vYnVn cy5nZW50b28ub3JnL3Nob3dfYnVnLmNnaT9pZD00MDc0MDEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJQ1UgNC44IGRvZXNuJ3QgaGF2ZSBrTnVtYmVy U3R5bGUuIFdlIGhhZCBiZXR0ZXIgdG8gdXNlIElDVSBDIEFQSSBpbgorICAgICAgICBnZW5lcmFs IHRvIGF2b2lkIHN1Y2ggaXNzdWVzLgorCisgICAgICAgIFRoaXMgcGF0Y2ggc2hvdWxkIG5vdCBt YWtlIGFueSBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBwbGF0Zm9ybS90ZXh0L0xvY2Fs aXplZE51bWJlcklDVS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJQ1VMb2NhbGU6OklDVUxvY2Fs ZSk6CisgICAgICAgIENoYW5nZSB0aGUgYXJndW1lbnQgdHlwZTogaWN1OjpMb2NhbGUgLT4gY29u c3QgY2hhcioKKyAgICAgICAgKFdlYkNvcmU6OklDVUxvY2FsZTo6fklDVUxvY2FsZSk6IERlbGV0 ZSBtX251bWJlckZvcm1hdCB3aXRoIHVudW1fY2xvc2UoKS4KKyAgICAgICAgKFdlYkNvcmU6OklD VUxvY2FsZTo6Y3JlYXRlKTogRG8gbm90IGNyZWF0ZSBpY3U6OkxvY2FsZS4KKyAgICAgICAgKFdl YkNvcmU6OklDVUxvY2FsZTo6Y3JlYXRlRm9yQ3VycmVudExvY2FsZSk6IGRpdHRvLgorICAgICAg ICAoV2ViQ29yZTo6SUNVTG9jYWxlOjpzZXREZWNpbWFsU3ltYm9sKToKKyAgICAgICAgVXNlIHVu dW1fZ2V0U3ltYm9sKCkgaW5zdGVhZCBvZiBEZWNpbWFsRm9ybWF0U3ltYm9sczo6Z2V0U3ltYm9s KCkuCisgICAgICAgIChXZWJDb3JlOjpJQ1VMb2NhbGU6OnNldERlY2ltYWxUZXh0QXR0cmlidXRl KToKKyAgICAgICAgQWRkZWQuIEEgdXRpbGl0eSBmdW5jdGlvbiB0byBzdG9yZSBwcmVmaXhlcyBh bmQgc3VmZml4ZXMuCisgICAgICAgIChXZWJDb3JlOjpJQ1VMb2NhbGU6OmluaXRpYWxpemVEZWNp bWFsRm9ybWF0KToKKyAgICAgICAgLSB1bnVtX29wZW4oKSwgaW5zdGVhZCBvZiBOdW1iZXJGb3Jt YXQ6OmNyZWF0ZUluc3RhbmNlKCkuCisgICAgICAgIC0gVXNlIEMgQVBJIHN5bWJvbHMuCisgICAg ICAgIC0gQ2FjaGUgcG9zaXRpdmUvbmVnYXRpdmUgcHJlZml4ZXMvc3VmZml4ZXMuCisgICAgICAg IChXZWJDb3JlOjpJQ1VMb2NhbGU6OmNvbnZlcnRUb0xvY2FsaXplZE51bWJlcik6IFVzZSBjYWNo ZWQgcHJlZml4ZXMgYW5kIHN1ZmZpeGVzLgorICAgICAgICAoV2ViQ29yZTo6bWF0Y2hlcyk6IFN0 b3AgdXNpbmcgdGVtcGxhdGUgYmVjYXVzZSB3ZSBkb24ndCB1c2UgVVN0cmluZyBhbnltb3JlLgor ICAgICAgICAoV2ViQ29yZTo6SUNVTG9jYWxlOjpkZXRlY3RTaWduQW5kR2V0RGlnaXRSYW5nZSk6 CisgICAgICAgIC0gVXNlIGNhY2hlZCBwcmVmaXhlcyBhbmQgc3VmZml4ZXMuCisgICAgICAgIC0g VXNlIFN0cmluZzo6c3RhcnRzV2l0aCgpIGFuZCBlbmRzV2l0aCgpLgorICAgICAgICAoV2ViQ29y ZTo6SUNVTG9jYWxlOjpjb252ZXJ0RnJvbUxvY2FsaXplZE51bWJlcik6CisgICAgICAgICogcGxh dGZvcm0vdGV4dC9Mb2NhbGl6ZWROdW1iZXJJQ1UuaDoKKyAgICAgICAgKElDVUxvY2FsZSk6CisK IDIwMTItMDMtMTEgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMTAzNTkuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0xvY2FsaXplZE51bWJlcklDVS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0xvY2FsaXplZE51bWJlcklDVS5jcHAKaW5kZXggZTUw NWYwZTBjNTVhMzQ3ZWZiMjM3NmUxMzA3NjRiZjQ0MmNiMzFlZi4uNzZmN2QyYzMyOWI2YmUxNzMz ZGU0NDRiYWQyOTBjYzNjZmQ2NzdlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vdGV4dC9Mb2NhbGl6ZWROdW1iZXJJQ1UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3RleHQvTG9jYWxpemVkTnVtYmVySUNVLmNwcApAQCAtMzIsOCArMzIsNiBAQAogI2luY2x1 ZGUgIkxvY2FsaXplZE51bWJlcklDVS5oIgogCiAjaW5jbHVkZSAiTG9jYWxpemVkTnVtYmVyLmgi Ci0jaW5jbHVkZSA8dW5pY29kZS9kZWNpbWZtdC5oPgotI2luY2x1ZGUgPHVuaWNvZGUvbnVtZm10 Lmg+CiAjaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJp bmdCdWlsZGVyLmg+CiAKQEAgLTQxLDI2ICszOSw1NyBAQCB1c2luZyBuYW1lc3BhY2UgaWN1Owog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLUlDVUxvY2FsZTo6SUNVTG9jYWxlKGNvbnN0IExvY2Fs ZSYgbG9jYWxlKQorSUNVTG9jYWxlOjpJQ1VMb2NhbGUoY29uc3QgY2hhciogbG9jYWxlKQogICAg IDogbV9sb2NhbGUobG9jYWxlKQorICAgICwgbV9udW1iZXJGb3JtYXQoMCkKICAgICAsIG1fZGlk Q3JlYXRlRGVjaW1hbEZvcm1hdChmYWxzZSkKIHsKIH0KIAorSUNVTG9jYWxlOjp+SUNVTG9jYWxl KCkKK3sKKyAgICB1bnVtX2Nsb3NlKG1fbnVtYmVyRm9ybWF0KTsKK30KKwogUGFzc093blB0cjxJ Q1VMb2NhbGU+IElDVUxvY2FsZTo6Y3JlYXRlKGNvbnN0IGNoYXIqIGxvY2FsZVN0cmluZykKIHsK LSAgICByZXR1cm4gYWRvcHRQdHIobmV3IElDVUxvY2FsZShMb2NhbGU6OmNyZWF0ZUNhbm9uaWNh bChsb2NhbGVTdHJpbmcpKSk7CisgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBJQ1VMb2NhbGUobG9j YWxlU3RyaW5nKSk7CiB9CiAKIFBhc3NPd25QdHI8SUNVTG9jYWxlPiBJQ1VMb2NhbGU6OmNyZWF0 ZUZvckN1cnJlbnRMb2NhbGUoKQogewotICAgIHJldHVybiBhZG9wdFB0cihuZXcgSUNVTG9jYWxl KExvY2FsZTo6Z2V0RGVmYXVsdCgpKSk7CisgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBJQ1VMb2Nh bGUoMCkpOwogfQogCi12b2lkIElDVUxvY2FsZTo6c2V0RGVjaW1hbFN5bWJvbCh1bnNpZ25lZCBp bmRleCwgRGVjaW1hbEZvcm1hdFN5bWJvbHM6OkVOdW1iZXJGb3JtYXRTeW1ib2wgc3ltYm9sKQor dm9pZCBJQ1VMb2NhbGU6OnNldERlY2ltYWxTeW1ib2wodW5zaWduZWQgaW5kZXgsIFVOdW1iZXJG b3JtYXRTeW1ib2wgc3ltYm9sKQogewotICAgIFVuaWNvZGVTdHJpbmcgdXN0cmluZyA9IG1fZGVj aW1hbEZvcm1hdC0+Z2V0RGVjaW1hbEZvcm1hdFN5bWJvbHMoKS0+Z2V0U3ltYm9sKHN5bWJvbCk7 Ci0gICAgbV9kZWNpbWFsU3ltYm9sc1tpbmRleF0gPSBTdHJpbmcodXN0cmluZy5nZXRCdWZmZXIo KSwgdXN0cmluZy5sZW5ndGgoKSk7CisgICAgVUVycm9yQ29kZSBzdGF0dXMgPSBVX1pFUk9fRVJS T1I7CisgICAgaW50MzJfdCBidWZmZXJMZW5ndGggPSB1bnVtX2dldFN5bWJvbChtX251bWJlckZv cm1hdCwgc3ltYm9sLCAwLCAwLCAmc3RhdHVzKTsKKyAgICBBU1NFUlQoVV9TVUNDRVNTKHN0YXR1 cykgfHwgc3RhdHVzID09IFVfQlVGRkVSX09WRVJGTE9XX0VSUk9SKTsKKyAgICBpZiAoVV9GQUlM VVJFKHN0YXR1cykgJiYgc3RhdHVzICE9IFVfQlVGRkVSX09WRVJGTE9XX0VSUk9SKQorICAgICAg ICByZXR1cm47CisgICAgVmVjdG9yPFVDaGFyPiBidWZmZXIoYnVmZmVyTGVuZ3RoKTsKKyAgICBz dGF0dXMgPSBVX1pFUk9fRVJST1I7CisgICAgdW51bV9nZXRTeW1ib2wobV9udW1iZXJGb3JtYXQs IHN5bWJvbCwgYnVmZmVyLmRhdGEoKSwgYnVmZmVyTGVuZ3RoLCAmc3RhdHVzKTsKKyAgICBpZiAo VV9GQUlMVVJFKHN0YXR1cykpCisgICAgICAgIHJldHVybjsKKyAgICBtX2RlY2ltYWxTeW1ib2xz W2luZGV4XSA9IFN0cmluZzo6YWRvcHQoYnVmZmVyKTsKK30KKwordm9pZCBJQ1VMb2NhbGU6OnNl dERlY2ltYWxUZXh0QXR0cmlidXRlKFN0cmluZyYgZGVzdGluYXRpb24sIFVOdW1iZXJGb3JtYXRU ZXh0QXR0cmlidXRlIHRhZykKK3sKKyAgICBVRXJyb3JDb2RlIHN0YXR1cyA9IFVfWkVST19FUlJP UjsKKyAgICBpbnQzMl90IGJ1ZmZlckxlbmd0aCA9IHVudW1fZ2V0VGV4dEF0dHJpYnV0ZShtX251 bWJlckZvcm1hdCwgdGFnLCAwLCAwLCAmc3RhdHVzKTsKKyAgICBBU1NFUlQoVV9TVUNDRVNTKHN0 YXR1cykgfHwgc3RhdHVzID09IFVfQlVGRkVSX09WRVJGTE9XX0VSUk9SKTsKKyAgICBpZiAoVV9G QUlMVVJFKHN0YXR1cykgJiYgc3RhdHVzICE9IFVfQlVGRkVSX09WRVJGTE9XX0VSUk9SKQorICAg ICAgICByZXR1cm47CisgICAgVmVjdG9yPFVDaGFyPiBidWZmZXIoYnVmZmVyTGVuZ3RoKTsKKyAg ICBzdGF0dXMgPSBVX1pFUk9fRVJST1I7CisgICAgdW51bV9nZXRUZXh0QXR0cmlidXRlKG1fbnVt YmVyRm9ybWF0LCB0YWcsIGJ1ZmZlci5kYXRhKCksIGJ1ZmZlckxlbmd0aCwgJnN0YXR1cyk7Cisg ICAgQVNTRVJUKFVfU1VDQ0VTUyhzdGF0dXMpKTsKKyAgICBpZiAoVV9GQUlMVVJFKHN0YXR1cykp CisgICAgICAgIHJldHVybjsKKyAgICBkZXN0aW5hdGlvbiA9IFN0cmluZzo6YWRvcHQoYnVmZmVy KTsKIH0KIAogdm9pZCBJQ1VMb2NhbGU6OmluaXRpYWxpemVEZWNpbWFsRm9ybWF0KCkKQEAgLTY5 LDQ0ICs5OCw0NyBAQCB2b2lkIElDVUxvY2FsZTo6aW5pdGlhbGl6ZURlY2ltYWxGb3JtYXQoKQog ICAgICAgICByZXR1cm47CiAgICAgbV9kaWRDcmVhdGVEZWNpbWFsRm9ybWF0ID0gdHJ1ZTsKICAg ICBVRXJyb3JDb2RlIHN0YXR1cyA9IFVfWkVST19FUlJPUjsKLSAgICBOdW1iZXJGb3JtYXQqIGZv cm1hdCA9IE51bWJlckZvcm1hdDo6Y3JlYXRlSW5zdGFuY2UobV9sb2NhbGUsIE51bWJlckZvcm1h dDo6a051bWJlclN0eWxlLCBzdGF0dXMpOworICAgIG1fbnVtYmVyRm9ybWF0ID0gdW51bV9vcGVu KFVOVU1fREVDSU1BTCwgMCwgMCwgbV9sb2NhbGUuZGF0YSgpLCAwLCAmc3RhdHVzKTsKICAgICBp ZiAoIVVfU1VDQ0VTUyhzdGF0dXMpKQogICAgICAgICByZXR1cm47Ci0gICAgbV9kZWNpbWFsRm9y bWF0ID0gYWRvcHRQdHIoc3RhdGljX2Nhc3Q8RGVjaW1hbEZvcm1hdCo+KGZvcm1hdCkpOwogCi0g ICAgc2V0RGVjaW1hbFN5bWJvbCgwLCBEZWNpbWFsRm9ybWF0U3ltYm9sczo6a1plcm9EaWdpdFN5 bWJvbCk7Ci0gICAgc2V0RGVjaW1hbFN5bWJvbCgxLCBEZWNpbWFsRm9ybWF0U3ltYm9sczo6a09u ZURpZ2l0U3ltYm9sKTsKLSAgICBzZXREZWNpbWFsU3ltYm9sKDIsIERlY2ltYWxGb3JtYXRTeW1i b2xzOjprVHdvRGlnaXRTeW1ib2wpOwotICAgIHNldERlY2ltYWxTeW1ib2woMywgRGVjaW1hbEZv cm1hdFN5bWJvbHM6OmtUaHJlZURpZ2l0U3ltYm9sKTsKLSAgICBzZXREZWNpbWFsU3ltYm9sKDQs IERlY2ltYWxGb3JtYXRTeW1ib2xzOjprRm91ckRpZ2l0U3ltYm9sKTsKLSAgICBzZXREZWNpbWFs U3ltYm9sKDUsIERlY2ltYWxGb3JtYXRTeW1ib2xzOjprRml2ZURpZ2l0U3ltYm9sKTsKLSAgICBz ZXREZWNpbWFsU3ltYm9sKDYsIERlY2ltYWxGb3JtYXRTeW1ib2xzOjprU2l4RGlnaXRTeW1ib2wp OwotICAgIHNldERlY2ltYWxTeW1ib2woNywgRGVjaW1hbEZvcm1hdFN5bWJvbHM6OmtTZXZlbkRp Z2l0U3ltYm9sKTsKLSAgICBzZXREZWNpbWFsU3ltYm9sKDgsIERlY2ltYWxGb3JtYXRTeW1ib2xz OjprRWlnaHREaWdpdFN5bWJvbCk7Ci0gICAgc2V0RGVjaW1hbFN5bWJvbCg5LCBEZWNpbWFsRm9y bWF0U3ltYm9sczo6a05pbmVEaWdpdFN5bWJvbCk7Ci0gICAgc2V0RGVjaW1hbFN5bWJvbChEZWNp bWFsU2VwYXJhdG9ySW5kZXgsIERlY2ltYWxGb3JtYXRTeW1ib2xzOjprRGVjaW1hbFNlcGFyYXRv clN5bWJvbCk7Ci0gICAgc2V0RGVjaW1hbFN5bWJvbChHcm91cFNlcGFyYXRvckluZGV4LCBEZWNp bWFsRm9ybWF0U3ltYm9sczo6a0dyb3VwaW5nU2VwYXJhdG9yU3ltYm9sKTsKKyAgICBzZXREZWNp bWFsU3ltYm9sKDAsIFVOVU1fWkVST19ESUdJVF9TWU1CT0wpOworICAgIHNldERlY2ltYWxTeW1i b2woMSwgVU5VTV9PTkVfRElHSVRfU1lNQk9MKTsKKyAgICBzZXREZWNpbWFsU3ltYm9sKDIsIFVO VU1fVFdPX0RJR0lUX1NZTUJPTCk7CisgICAgc2V0RGVjaW1hbFN5bWJvbCgzLCBVTlVNX1RIUkVF X0RJR0lUX1NZTUJPTCk7CisgICAgc2V0RGVjaW1hbFN5bWJvbCg0LCBVTlVNX0ZPVVJfRElHSVRf U1lNQk9MKTsKKyAgICBzZXREZWNpbWFsU3ltYm9sKDUsIFVOVU1fRklWRV9ESUdJVF9TWU1CT0wp OworICAgIHNldERlY2ltYWxTeW1ib2woNiwgVU5VTV9TSVhfRElHSVRfU1lNQk9MKTsKKyAgICBz ZXREZWNpbWFsU3ltYm9sKDcsIFVOVU1fU0VWRU5fRElHSVRfU1lNQk9MKTsKKyAgICBzZXREZWNp bWFsU3ltYm9sKDgsIFVOVU1fRUlHSFRfRElHSVRfU1lNQk9MKTsKKyAgICBzZXREZWNpbWFsU3lt Ym9sKDksIFVOVU1fTklORV9ESUdJVF9TWU1CT0wpOworICAgIHNldERlY2ltYWxTeW1ib2woRGVj aW1hbFNlcGFyYXRvckluZGV4LCBVTlVNX0RFQ0lNQUxfU0VQQVJBVE9SX1NZTUJPTCk7CisgICAg c2V0RGVjaW1hbFN5bWJvbChHcm91cFNlcGFyYXRvckluZGV4LCBVTlVNX0dST1VQSU5HX1NFUEFS QVRPUl9TWU1CT0wpOworICAgIHNldERlY2ltYWxUZXh0QXR0cmlidXRlKG1fcG9zaXRpdmVQcmVm aXgsIFVOVU1fUE9TSVRJVkVfUFJFRklYKTsKKyAgICBzZXREZWNpbWFsVGV4dEF0dHJpYnV0ZSht X3Bvc2l0aXZlU3VmZml4LCBVTlVNX1BPU0lUSVZFX1NVRkZJWCk7CisgICAgc2V0RGVjaW1hbFRl eHRBdHRyaWJ1dGUobV9uZWdhdGl2ZVByZWZpeCwgVU5VTV9ORUdBVElWRV9QUkVGSVgpOworICAg IHNldERlY2ltYWxUZXh0QXR0cmlidXRlKG1fbmVnYXRpdmVTdWZmaXgsIFVOVU1fTkVHQVRJVkVf U1VGRklYKTsKKyAgICBBU1NFUlQoIW1fcG9zaXRpdmVQcmVmaXguaXNFbXB0eSgpIHx8ICFtX3Bv c2l0aXZlU3VmZml4LmlzRW1wdHkoKSB8fCAhbV9uZWdhdGl2ZVByZWZpeC5pc0VtcHR5KCkgfHwg IW1fbmVnYXRpdmVTdWZmaXguaXNFbXB0eSgpKTsKIH0KIAogU3RyaW5nIElDVUxvY2FsZTo6Y29u dmVydFRvTG9jYWxpemVkTnVtYmVyKGNvbnN0IFN0cmluZyYgaW5wdXQpCiB7CiAgICAgaW5pdGlh bGl6ZURlY2ltYWxGb3JtYXQoKTsKLSAgICBpZiAoIW1fZGVjaW1hbEZvcm1hdCB8fCBpbnB1dC5p c0VtcHR5KCkpCisgICAgaWYgKCFtX251bWJlckZvcm1hdCB8fCBpbnB1dC5pc0VtcHR5KCkpCiAg ICAgICAgIHJldHVybiBpbnB1dDsKIAogICAgIHVuc2lnbmVkIGkgPSAwOwogICAgIGJvb2wgaXNO ZWdhdGl2ZSA9IGZhbHNlOwogICAgIFVuaWNvZGVTdHJpbmcgdXN0cmluZzsKKyAgICBTdHJpbmdC dWlsZGVyIGJ1aWxkZXI7CisgICAgYnVpbGRlci5yZXNlcnZlQ2FwYWNpdHkoaW5wdXQubGVuZ3Ro KCkpOwogCiAgICAgaWYgKGlucHV0WzBdID09ICctJykgewogICAgICAgICArK2k7CiAgICAgICAg IGlzTmVnYXRpdmUgPSB0cnVlOwotICAgICAgICBtX2RlY2ltYWxGb3JtYXQtPmdldE5lZ2F0aXZl UHJlZml4KHVzdHJpbmcpOworICAgICAgICBidWlsZGVyLmFwcGVuZChtX25lZ2F0aXZlUHJlZml4 KTsKICAgICB9IGVsc2UKLSAgICAgICAgbV9kZWNpbWFsRm9ybWF0LT5nZXRQb3NpdGl2ZVByZWZp eCh1c3RyaW5nKTsKLSAgICBTdHJpbmdCdWlsZGVyIGJ1aWxkZXI7Ci0gICAgYnVpbGRlci5yZXNl cnZlQ2FwYWNpdHkoaW5wdXQubGVuZ3RoKCkpOwotICAgIGJ1aWxkZXIuYXBwZW5kKHVzdHJpbmcu Z2V0QnVmZmVyKCksIHVzdHJpbmcubGVuZ3RoKCkpOworICAgICAgICBidWlsZGVyLmFwcGVuZCht X3Bvc2l0aXZlUHJlZml4KTsKIAogICAgIGZvciAoOyBpIDwgaW5wdXQubGVuZ3RoKCk7ICsraSkg ewogICAgICAgICBzd2l0Y2ggKGlucHV0W2ldKSB7CkBAIC0xMzAsNzMgKzE2Miw0NSBAQCBTdHJp bmcgSUNVTG9jYWxlOjpjb252ZXJ0VG9Mb2NhbGl6ZWROdW1iZXIoY29uc3QgU3RyaW5nJiBpbnB1 dCkKICAgICAgICAgfQogICAgIH0KIAotICAgIGlmIChpc05lZ2F0aXZlKQotICAgICAgICBtX2Rl Y2ltYWxGb3JtYXQtPmdldE5lZ2F0aXZlU3VmZml4KHVzdHJpbmcpOwotICAgIGVsc2UKLSAgICAg ICAgbV9kZWNpbWFsRm9ybWF0LT5nZXRQb3NpdGl2ZVN1ZmZpeCh1c3RyaW5nKTsKLSAgICBidWls ZGVyLmFwcGVuZCh1c3RyaW5nLmdldEJ1ZmZlcigpLCB1c3RyaW5nLmxlbmd0aCgpKTsKKyAgICBi dWlsZGVyLmFwcGVuZChpc05lZ2F0aXZlID8gbV9uZWdhdGl2ZVN1ZmZpeCA6IG1fcG9zaXRpdmVT dWZmaXgpOwogCiAgICAgcmV0dXJuIGJ1aWxkZXIudG9TdHJpbmcoKTsKIH0KIAotdGVtcGxhdGUg PGNsYXNzIFN0cmluZ1R5cGU+IHN0YXRpYyBib29sIG1hdGNoZXMoY29uc3QgU3RyaW5nJiB0ZXh0 LCB1bnNpZ25lZCBwb3NpdGlvbiwgY29uc3QgU3RyaW5nVHlwZSYgcGFydCkKK3N0YXRpYyBib29s IG1hdGNoZXMoY29uc3QgU3RyaW5nJiB0ZXh0LCB1bnNpZ25lZCBwb3NpdGlvbiwgY29uc3QgU3Ry aW5nJiBwYXJ0KQogewogICAgIGlmIChwYXJ0LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIHRy dWU7CiAgICAgaWYgKHBvc2l0aW9uICsgcGFydC5sZW5ndGgoKSA+IHRleHQubGVuZ3RoKCkpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgc3RhdGlj X2Nhc3Q8dW5zaWduZWQ+KHBhcnQubGVuZ3RoKCkpOyArK2kpIHsKKyAgICBmb3IgKHVuc2lnbmVk IGkgPSAwOyBpIDwgcGFydC5sZW5ndGgoKTsgKytpKSB7CiAgICAgICAgIGlmICh0ZXh0W3Bvc2l0 aW9uICsgaV0gIT0gcGFydFtpXSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAg ICAgcmV0dXJuIHRydWU7CiB9CiAKLXN0YXRpYyBib29sIGVuZHNXaXRoKGNvbnN0IFN0cmluZyYg dGV4dCwgY29uc3QgVW5pY29kZVN0cmluZyYgc3VmZml4KQotewotICAgIGlmIChzdWZmaXgubGVu Z3RoKCkgPD0gMCkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgdW5zaWduZWQgc3VmZml4TGVu Z3RoID0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHN1ZmZpeC5sZW5ndGgoKSk7Ci0gICAgaWYgKHN1 ZmZpeExlbmd0aCA+IHRleHQubGVuZ3RoKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB1 bnNpZ25lZCBzdGFydCA9IHRleHQubGVuZ3RoKCkgLSBzdWZmaXhMZW5ndGg7Ci0gICAgZm9yICh1 bnNpZ25lZCBpID0gMDsgaSA8IHN1ZmZpeExlbmd0aDsgKytpKSB7Ci0gICAgICAgIGlmICh0ZXh0 W3N0YXJ0ICsgaV0gIT0gc3VmZml4W2ldKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAg IH0KLSAgICByZXR1cm4gdHJ1ZTsKLX0KLQogYm9vbCBJQ1VMb2NhbGU6OmRldGVjdFNpZ25BbmRH ZXREaWdpdFJhbmdlKGNvbnN0IFN0cmluZyYgaW5wdXQsIGJvb2wmIGlzTmVnYXRpdmUsIHVuc2ln bmVkJiBzdGFydEluZGV4LCB1bnNpZ25lZCYgZW5kSW5kZXgpCiB7CiAgICAgc3RhcnRJbmRleCA9 IDA7CiAgICAgZW5kSW5kZXggPSBpbnB1dC5sZW5ndGgoKTsKLSAgICBVbmljb2RlU3RyaW5nIHBy ZWZpeDsKLSAgICBtX2RlY2ltYWxGb3JtYXQtPmdldE5lZ2F0aXZlUHJlZml4KHByZWZpeCk7Ci0g ICAgVW5pY29kZVN0cmluZyBzdWZmaXg7Ci0gICAgbV9kZWNpbWFsRm9ybWF0LT5nZXROZWdhdGl2 ZVN1ZmZpeChzdWZmaXgpOwotICAgIGlmIChwcmVmaXguaXNFbXB0eSgpICYmIHN1ZmZpeC5pc0Vt cHR5KCkpIHsKLSAgICAgICAgbV9kZWNpbWFsRm9ybWF0LT5nZXRQb3NpdGl2ZVByZWZpeChwcmVm aXgpOwotICAgICAgICBtX2RlY2ltYWxGb3JtYXQtPmdldFBvc2l0aXZlU3VmZml4KHN1ZmZpeCk7 Ci0gICAgICAgIEFTU0VSVCghKHByZWZpeC5pc0VtcHR5KCkgJiYgc3VmZml4LmlzRW1wdHkoKSkp OwotICAgICAgICBpZiAobWF0Y2hlcyhpbnB1dCwgMCwgcHJlZml4KSAmJiBlbmRzV2l0aChpbnB1 dCwgc3VmZml4KSkgeworICAgIGlmIChtX25lZ2F0aXZlUHJlZml4LmlzRW1wdHkoKSAmJiBtX25l Z2F0aXZlU3VmZml4LmlzRW1wdHkoKSkgeworICAgICAgICBpZiAoaW5wdXQuc3RhcnRzV2l0aCht X3Bvc2l0aXZlUHJlZml4KSAmJiBpbnB1dC5lbmRzV2l0aChtX3Bvc2l0aXZlU3VmZml4KSkgewog ICAgICAgICAgICAgaXNOZWdhdGl2ZSA9IGZhbHNlOwotICAgICAgICAgICAgc3RhcnRJbmRleCA9 IHByZWZpeC5sZW5ndGgoKTsKLSAgICAgICAgICAgIGVuZEluZGV4IC09IHN1ZmZpeC5sZW5ndGgo KTsKKyAgICAgICAgICAgIHN0YXJ0SW5kZXggPSBtX3Bvc2l0aXZlUHJlZml4Lmxlbmd0aCgpOwor ICAgICAgICAgICAgZW5kSW5kZXggLT0gbV9wb3NpdGl2ZVN1ZmZpeC5sZW5ndGgoKTsKICAgICAg ICAgfSBlbHNlCiAgICAgICAgICAgICBpc05lZ2F0aXZlID0gdHJ1ZTsKICAgICB9IGVsc2Ugewot ICAgICAgICBpZiAobWF0Y2hlcyhpbnB1dCwgMCwgcHJlZml4KSAmJiBlbmRzV2l0aChpbnB1dCwg c3VmZml4KSkgeworICAgICAgICBpZiAoaW5wdXQuc3RhcnRzV2l0aChtX25lZ2F0aXZlUHJlZml4 KSAmJiBpbnB1dC5lbmRzV2l0aChtX25lZ2F0aXZlU3VmZml4KSkgewogICAgICAgICAgICAgaXNO ZWdhdGl2ZSA9IHRydWU7Ci0gICAgICAgICAgICBzdGFydEluZGV4ID0gcHJlZml4Lmxlbmd0aCgp OwotICAgICAgICAgICAgZW5kSW5kZXggLT0gc3VmZml4Lmxlbmd0aCgpOworICAgICAgICAgICAg c3RhcnRJbmRleCA9IG1fbmVnYXRpdmVQcmVmaXgubGVuZ3RoKCk7CisgICAgICAgICAgICBlbmRJ bmRleCAtPSBtX25lZ2F0aXZlU3VmZml4Lmxlbmd0aCgpOwogICAgICAgICB9IGVsc2UgewogICAg ICAgICAgICAgaXNOZWdhdGl2ZSA9IGZhbHNlOwotICAgICAgICAgICAgbV9kZWNpbWFsRm9ybWF0 LT5nZXRQb3NpdGl2ZVByZWZpeChwcmVmaXgpOwotICAgICAgICAgICAgbV9kZWNpbWFsRm9ybWF0 LT5nZXRQb3NpdGl2ZVN1ZmZpeChzdWZmaXgpOwotICAgICAgICAgICAgaWYgKG1hdGNoZXMoaW5w dXQsIDAsIHByZWZpeCkgJiYgZW5kc1dpdGgoaW5wdXQsIHN1ZmZpeCkpIHsKLSAgICAgICAgICAg ICAgICBzdGFydEluZGV4ID0gcHJlZml4Lmxlbmd0aCgpOwotICAgICAgICAgICAgICAgIGVuZElu ZGV4IC09IHN1ZmZpeC5sZW5ndGgoKTsKKyAgICAgICAgICAgIGlmIChpbnB1dC5zdGFydHNXaXRo KG1fcG9zaXRpdmVQcmVmaXgpICYmIGlucHV0LmVuZHNXaXRoKG1fcG9zaXRpdmVTdWZmaXgpKSB7 CisgICAgICAgICAgICAgICAgc3RhcnRJbmRleCA9IG1fcG9zaXRpdmVQcmVmaXgubGVuZ3RoKCk7 CisgICAgICAgICAgICAgICAgZW5kSW5kZXggLT0gbV9wb3NpdGl2ZVN1ZmZpeC5sZW5ndGgoKTsK ICAgICAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAg ICAgfQpAQCAtMjE5LDcgKzIyMyw3IEBAIFN0cmluZyBJQ1VMb2NhbGU6OmNvbnZlcnRGcm9tTG9j YWxpemVkTnVtYmVyKGNvbnN0IFN0cmluZyYgbG9jYWxpemVkKQogewogICAgIGluaXRpYWxpemVE ZWNpbWFsRm9ybWF0KCk7CiAgICAgU3RyaW5nIGlucHV0ID0gbG9jYWxpemVkLnN0cmlwV2hpdGVT cGFjZSgpOwotICAgIGlmICghbV9kZWNpbWFsRm9ybWF0IHx8IGlucHV0LmlzRW1wdHkoKSkKKyAg ICBpZiAoIW1fbnVtYmVyRm9ybWF0IHx8IGlucHV0LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJu IGlucHV0OwogCiAgICAgYm9vbCBpc05lZ2F0aXZlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vdGV4dC9Mb2NhbGl6ZWROdW1iZXJJQ1UuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL3RleHQvTG9jYWxpemVkTnVtYmVySUNVLmgKaW5kZXggNDk0YWQ5NDNmMTU4YmVjYzE5 MGQ0ZDYzYWY4NjgzYWJmOTg2NzU3Mi4uZmQ4NTYyMmNkMjY4YzcyODZlODYzMmNjMWFjMjY4N2Yy N2YzY2QwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9Mb2NhbGl6 ZWROdW1iZXJJQ1UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0xvY2FsaXpl ZE51bWJlcklDVS5oCkBAIC0zMSw5ICszMSwxMCBAQAogI2lmbmRlZiBMb2NhbGl6ZWROdW1iZXJJ Q1VfaAogI2RlZmluZSBMb2NhbGl6ZWROdW1iZXJJQ1VfaAogCi0jaW5jbHVkZSA8dW5pY29kZS9k ZWNpbWZtdC5oPgorI2luY2x1ZGUgPHVuaWNvZGUvdW51bS5oPgogI2luY2x1ZGUgPHd0Zi9Gb3J3 YXJkLmg+CiAjaW5jbHVkZSA8d3RmL093blB0ci5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJp bmcuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogbmFtZXNwYWNlIFdlYkNv cmUgewpAQCAtNDMsMTkgKzQ0LDIxIEBAIGNsYXNzIElDVUxvY2FsZSB7CiBwdWJsaWM6CiAgICAg c3RhdGljIFBhc3NPd25QdHI8SUNVTG9jYWxlPiBjcmVhdGUoY29uc3QgY2hhciogbG9jYWxlU3Ry aW5nKTsKICAgICBzdGF0aWMgUGFzc093blB0cjxJQ1VMb2NhbGU+IGNyZWF0ZUZvckN1cnJlbnRM b2NhbGUoKTsKKyAgICB+SUNVTG9jYWxlKCk7CiAgICAgU3RyaW5nIGNvbnZlcnRUb0xvY2FsaXpl ZE51bWJlcihjb25zdCBTdHJpbmcmKTsKICAgICBTdHJpbmcgY29udmVydEZyb21Mb2NhbGl6ZWRO dW1iZXIoY29uc3QgU3RyaW5nJik7CiAKIHByaXZhdGU6Ci0gICAgZXhwbGljaXQgSUNVTG9jYWxl KGNvbnN0IGljdTo6TG9jYWxlJik7Ci0gICAgdm9pZCBzZXREZWNpbWFsU3ltYm9sKHVuc2lnbmVk IGluZGV4LCBpY3U6OkRlY2ltYWxGb3JtYXRTeW1ib2xzOjpFTnVtYmVyRm9ybWF0U3ltYm9sKTsK KyAgICBleHBsaWNpdCBJQ1VMb2NhbGUoY29uc3QgY2hhciopOworICAgIHZvaWQgc2V0RGVjaW1h bFN5bWJvbCh1bnNpZ25lZCBpbmRleCwgVU51bWJlckZvcm1hdFN5bWJvbCk7CisgICAgdm9pZCBz ZXREZWNpbWFsVGV4dEF0dHJpYnV0ZShTdHJpbmcmLCBVTnVtYmVyRm9ybWF0VGV4dEF0dHJpYnV0 ZSk7CiAgICAgdm9pZCBpbml0aWFsaXplRGVjaW1hbEZvcm1hdCgpOwogCiAgICAgYm9vbCBkZXRl Y3RTaWduQW5kR2V0RGlnaXRSYW5nZShjb25zdCBTdHJpbmcmIGlucHV0LCBib29sJiBpc05lZ2F0 aXZlLCB1bnNpZ25lZCYgc3RhcnRJbmRleCwgdW5zaWduZWQmIGVuZEluZGV4KTsKICAgICB1bnNp Z25lZCBtYXRjaGVkRGVjaW1hbFN5bWJvbEluZGV4KGNvbnN0IFN0cmluZyYgaW5wdXQsIHVuc2ln bmVkJiBwb3NpdGlvbik7CiAKLSAgICBpY3U6OkxvY2FsZSBtX2xvY2FsZTsKLSAgICBPd25QdHI8 aWN1OjpEZWNpbWFsRm9ybWF0PiBtX2RlY2ltYWxGb3JtYXQ7CisgICAgQ1N0cmluZyBtX2xvY2Fs ZTsKKyAgICBVTnVtYmVyRm9ybWF0KiBtX251bWJlckZvcm1hdDsKICAgICBlbnVtIHsKICAgICAg ICAgLy8gMC05IGZvciBkaWdpdHMuCiAgICAgICAgIERlY2ltYWxTZXBhcmF0b3JJbmRleCA9IDEw LApAQCAtNjMsNiArNjYsMTAgQEAgcHJpdmF0ZToKICAgICAgICAgRGVjaW1hbFN5bWJvbHNTaXpl CiAgICAgfTsKICAgICBTdHJpbmcgbV9kZWNpbWFsU3ltYm9sc1tEZWNpbWFsU3ltYm9sc1NpemVd OworICAgIFN0cmluZyBtX3Bvc2l0aXZlUHJlZml4OworICAgIFN0cmluZyBtX3Bvc2l0aXZlU3Vm Zml4OworICAgIFN0cmluZyBtX25lZ2F0aXZlUHJlZml4OworICAgIFN0cmluZyBtX25lZ2F0aXZl U3VmZml4OwogICAgIGJvb2wgbV9kaWRDcmVhdGVEZWNpbWFsRm9ybWF0OwogfTsKIAo=