233411 2021-11-21 21:17:42 -0800 Unused getEOTHeader method in OpenTypeUtilities.cpp 2021-11-22 12:35:15 -0800 1 1 1 Unclassified WebKit Layout and Rendering Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 233030 1 jean-yves.avenard jean-yves.avenard bfulgham simon.fraser webkit-bug-importer youennf zalan oldest_to_newest 1817225 0 jean-yves.avenard 2021-11-21 21:17:42 -0800 The method `bool getEOTHeader(SharedBuffer* fontData, EOTHeader& eotHeader, size_t& overlayDst, size_t& overlaySrc, size_t& overlayLength)` is unused in the code 1817226 1 webkit-bug-importer 2021-11-21 21:18:17 -0800 <rdar://problem/85656827> 1817227 2 444938 jean-yves.avenard 2021-11-21 21:21:51 -0800 Created attachment 444938 Patch 1817228 3 444939 jean-yves.avenard 2021-11-21 21:25:32 -0800 Created attachment 444939 Patch 1817234 4 jean-yves.avenard 2021-11-21 21:39:50 -0800 To add: getEOTHeader requires a flattened SharedBuffer ; this code appears ancient, the symbol isn't exported and would require modification following bug 233030 which would make any customers incompatible anyway. 1817330 5 ews-feeder 2021-11-22 12:35:13 -0800 Committed r286117 (244504@main): <https://commits.webkit.org/244504@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 444939. 444938 2021-11-21 21:21:51 -0800 2021-11-21 21:25:27 -0800 Patch bug-233411-20211122162150.patch text/plain 8840 jean-yves.avenard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmQxZGQyNzIyYjVlNjhm ODAyNjAxZDY5NmRmNWE2NGYzZGIwMjhmNC4uMzBkYTYxMDM5MTI2ZGViYmQ5NzBlY2MwNDBjOGNk MGEwZTNhOTBhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTExLTIxICBKZWFu LVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHVudXNlZCBn ZXRFT1RIZWFkZXIgbWV0aG9kIGluIE9wZW5UeXBlVXRpbGl0aWVzLmNwcAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzNDExCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGJlaGF2aW91 ci4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL29wZW50eXBlL09wZW5UeXBlVXRpbGl0 aWVzLmNwcDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9vcGVudHlwZS9PcGVuVHlwZVV0 aWxpdGllcy5oOgorCiAyMDIxLTExLTIxICBKZWFuLVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBsZS5j b20+CiAKICAgICAgICAgRGlzdGluZ3Vpc2ggY29udGlndW91cyBTaGFyZWRCdWZmZXIgZnJvbSBu b24tY29udGlndW91cyBvbmUgYW5kIGd1YXJhbnRlZSBpbW11dGFiaWxpdHkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW50eXBlL09wZW5UeXBlVXRpbGl0 aWVzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW50eXBlL09wZW5U eXBlVXRpbGl0aWVzLmNwcAppbmRleCA2ZDAzODYzYjM2NmMyNDVmNDQyZjc0MzkzNzE5YWJlYWRh NWM0YjIwLi4zMjE2YjdlZjA2ZTlhNDgwMDk5MTU5MjMwNTZhY2EzZmNiZjkyZDFhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVudHlwZS9PcGVuVHlwZVV0 aWxpdGllcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnR5 cGUvT3BlblR5cGVVdGlsaXRpZXMuY3BwCkBAIC0xOTcsMTU1ICsxOTcsNiBAQCB2b2lkIEVPVEhl YWRlcjo6YXBwZW5kUGFkZGluZ1Nob3J0KCkKICAgICBtX2J1ZmZlci5hcHBlbmQocmVpbnRlcnBy ZXRfY2FzdDx1aW50OF90Kj4oJnBhZGRpbmcpLCBzaXplb2YocGFkZGluZykpOwogfQogCi1ib29s IGdldEVPVEhlYWRlcihTaGFyZWRCdWZmZXIqIGZvbnREYXRhLCBFT1RIZWFkZXImIGVvdEhlYWRl ciwgc2l6ZV90JiBvdmVybGF5RHN0LCBzaXplX3QmIG92ZXJsYXlTcmMsIHNpemVfdCYgb3Zlcmxh eUxlbmd0aCkKLXsKLSAgICBvdmVybGF5RHN0ID0gMDsKLSAgICBvdmVybGF5U3JjID0gMDsKLSAg ICBvdmVybGF5TGVuZ3RoID0gMDsKLQotICAgIHNpemVfdCBkYXRhTGVuZ3RoID0gZm9udERhdGEt PnNpemUoKTsKLSAgICBhdXRvKiBkYXRhID0gZm9udERhdGEtPmRhdGEoKTsKLQotICAgIEVPVFBy ZWZpeCogcHJlZml4ID0gZW90SGVhZGVyLnByZWZpeCgpOwotCi0gICAgcHJlZml4LT5mb250RGF0 YVNpemUgPSBkYXRhTGVuZ3RoOwotICAgIHByZWZpeC0+dmVyc2lvbiA9IDB4MDAwMjAwMDE7Ci0g ICAgcHJlZml4LT5mbGFncyA9IDA7Ci0KLSAgICBpZiAoZGF0YUxlbmd0aCA8IG9mZnNldG9mKHNm bnRIZWFkZXIsIHRhYmxlcykpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIGNvbnN0IHNm bnRIZWFkZXIqIHNmbnQgPSByZWludGVycHJldF9jYXN0PGNvbnN0IHNmbnRIZWFkZXIqPihkYXRh KTsKLQotICAgIGlmIChkYXRhTGVuZ3RoIDwgb2Zmc2V0b2Yoc2ZudEhlYWRlciwgdGFibGVzKSAr IHNmbnQtPm51bVRhYmxlcyAqIHNpemVvZihUYWJsZURpcmVjdG9yeUVudHJ5KSkKLSAgICAgICAg cmV0dXJuIGZhbHNlOwotCi0gICAgYm9vbCBoYXZlT1MyID0gZmFsc2U7Ci0gICAgYm9vbCBoYXZl SGVhZCA9IGZhbHNlOwotICAgIGJvb2wgaGF2ZU5hbWUgPSBmYWxzZTsKLQotICAgIGNvbnN0IEJp Z0VuZGlhblVTaG9ydCogZmFtaWx5TmFtZSA9IDA7Ci0gICAgdW5zaWduZWQgc2hvcnQgZmFtaWx5 TmFtZUxlbmd0aCA9IDA7Ci0gICAgY29uc3QgQmlnRW5kaWFuVVNob3J0KiBzdWJmYW1pbHlOYW1l ID0gMDsKLSAgICB1bnNpZ25lZCBzaG9ydCBzdWJmYW1pbHlOYW1lTGVuZ3RoID0gMDsKLSAgICBj b25zdCBCaWdFbmRpYW5VU2hvcnQqIGZ1bGxOYW1lID0gMDsKLSAgICB1bnNpZ25lZCBzaG9ydCBm dWxsTmFtZUxlbmd0aCA9IDA7Ci0gICAgY29uc3QgQmlnRW5kaWFuVVNob3J0KiB2ZXJzaW9uU3Ry aW5nID0gMDsKLSAgICB1bnNpZ25lZCBzaG9ydCB2ZXJzaW9uU3RyaW5nTGVuZ3RoID0gMDsKLQot ICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBzZm50LT5udW1UYWJsZXM7IGkrKykgewotICAg ICAgICB1bnNpZ25lZCB0YWJsZU9mZnNldCA9IHNmbnQtPnRhYmxlc1tpXS5vZmZzZXQ7Ci0gICAg ICAgIHVuc2lnbmVkIHRhYmxlTGVuZ3RoID0gc2ZudC0+dGFibGVzW2ldLmxlbmd0aDsKLQotICAg ICAgICBpZiAoZGF0YUxlbmd0aCA8IHRhYmxlT2Zmc2V0IHx8IGRhdGFMZW5ndGggPCB0YWJsZUxl bmd0aCB8fCBkYXRhTGVuZ3RoIDwgdGFibGVPZmZzZXQgKyB0YWJsZUxlbmd0aCkKLSAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKLQotICAgICAgICB1bnNpZ25lZCB0YWJsZVRhZyA9IHNmbnQtPnRh Ymxlc1tpXS50YWc7Ci0gICAgICAgIHN3aXRjaCAodGFibGVUYWcpIHsKLSAgICAgICAgICAgIGNh c2UgJ09TLzInOgotICAgICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKGRh dGFMZW5ndGggPCB0YWJsZU9mZnNldCArIHNpemVvZihPUzJUYWJsZSkpCi0gICAgICAgICAgICAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICAgICAgICAgICAgICAgICAgaGF2ZU9TMiA9 IHRydWU7Ci0gICAgICAgICAgICAgICAgICAgIGNvbnN0IE9TMlRhYmxlKiBPUzIgPSByZWludGVy cHJldF9jYXN0PGNvbnN0IE9TMlRhYmxlKj4oZGF0YSArIHRhYmxlT2Zmc2V0KTsKLSAgICAgICAg ICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBqID0gMDsgaiA8IDEwOyBqKyspCi0gICAgICAgICAg ICAgICAgICAgICAgICBwcmVmaXgtPmZvbnRQQU5PU0Vbal0gPSBPUzItPnBhbm9zZVtqXTsKLSAg ICAgICAgICAgICAgICAgICAgcHJlZml4LT5pdGFsaWMgPSBPUzItPmZzU2VsZWN0aW9uICYgMHgw MTsKLSAgICAgICAgICAgICAgICAgICAgcHJlZml4LT53ZWlnaHQgPSBPUzItPndlaWdodENsYXNz OwotICAgICAgICAgICAgICAgICAgICAvLyBGSVhNRTogU2hvdWxkIHVzZSBPUzItPmZzVHlwZSwg YnV0IHNvbWUgVHJ1ZVR5cGUgZm9udHMgc2V0IGl0IHRvIGFuIG92ZXItcmVzdHJpY3RpdmUgdmFs dWUuCi0gICAgICAgICAgICAgICAgICAgIC8vIFNpbmNlIEFUUyBkb2VzIG5vdCBlbmZvcmNlIHRo aXMgb24gTWFjIE9TIFgsIHdlIGRvIG5vdCBlbmZvcmNlIGl0IGVpdGhlci4KLSAgICAgICAgICAg ICAgICAgICAgcHJlZml4LT5mc1R5cGUgPSAwOyAgICAgICAgICAgIAotICAgICAgICAgICAgICAg ICAgICBmb3IgKHVuc2lnbmVkIGogPSAwOyBqIDwgNDsgaisrKQotICAgICAgICAgICAgICAgICAg ICAgICAgcHJlZml4LT51bmljb2RlUmFuZ2Vbal0gPSBPUzItPnVuaWNvZGVSYW5nZVtqXTsKLSAg ICAgICAgICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBqID0gMDsgaiA8IDI7IGorKykKLSAgICAg ICAgICAgICAgICAgICAgICAgIHByZWZpeC0+Y29kZVBhZ2VSYW5nZVtqXSA9IE9TMi0+Y29kZVBh Z2VSYW5nZVtqXTsKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAg fQotICAgICAgICAgICAgY2FzZSAnaGVhZCc6Ci0gICAgICAgICAgICAgICAgewotICAgICAgICAg ICAgICAgICAgICBpZiAoZGF0YUxlbmd0aCA8IHRhYmxlT2Zmc2V0ICsgc2l6ZW9mKGhlYWRUYWJs ZSkpCi0gICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICAgICAgICAg ICAgICAgICAgaGF2ZUhlYWQgPSB0cnVlOwotICAgICAgICAgICAgICAgICAgICBjb25zdCBoZWFk VGFibGUqIGhlYWQgPSByZWludGVycHJldF9jYXN0PGNvbnN0IGhlYWRUYWJsZSo+KGRhdGEgKyB0 YWJsZU9mZnNldCk7Ci0gICAgICAgICAgICAgICAgICAgIHByZWZpeC0+Y2hlY2tTdW1BZGp1c3Rt ZW50ID0gaGVhZC0+Y2hlY2tTdW1BZGp1c3RtZW50OwotICAgICAgICAgICAgICAgICAgICBicmVh azsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBjYXNlICduYW1lJzoKLSAgICAgICAg ICAgICAgICB7Ci0gICAgICAgICAgICAgICAgICAgIGlmIChkYXRhTGVuZ3RoIDwgdGFibGVPZmZz ZXQgKyBvZmZzZXRvZihuYW1lVGFibGUsIG5hbWVSZWNvcmRzKSkKLSAgICAgICAgICAgICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgICAgICAgICAgICAgICAgICBoYXZlTmFtZSA9IHRy dWU7Ci0gICAgICAgICAgICAgICAgICAgIGNvbnN0IG5hbWVUYWJsZSogbmFtZSA9IHJlaW50ZXJw cmV0X2Nhc3Q8Y29uc3QgbmFtZVRhYmxlKj4oZGF0YSArIHRhYmxlT2Zmc2V0KTsKLSAgICAgICAg ICAgICAgICAgICAgZm9yIChpbnQgaiA9IDA7IGogPCBuYW1lLT5jb3VudDsgaisrKSB7Ci0gICAg ICAgICAgICAgICAgICAgICAgICBpZiAoZGF0YUxlbmd0aCA8IHRhYmxlT2Zmc2V0ICsgb2Zmc2V0 b2YobmFtZVRhYmxlLCBuYW1lUmVjb3JkcykgKyAoaiArIDEpICogc2l6ZW9mKG5hbWVSZWNvcmQp KQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAg ICAgICAgICAgICAgIGlmIChuYW1lLT5uYW1lUmVjb3Jkc1tqXS5wbGF0Zm9ybUlEID09IDMgJiYg bmFtZS0+bmFtZVJlY29yZHNbal0uZW5jb2RpbmdJRCA9PSAxICYmIG5hbWUtPm5hbWVSZWNvcmRz W2pdLmxhbmd1YWdlSUQgPT0gMHgwNDA5KSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAg aWYgKGRhdGFMZW5ndGggPCB0YWJsZU9mZnNldCArIG5hbWUtPnN0cmluZ09mZnNldCArIG5hbWUt Pm5hbWVSZWNvcmRzW2pdLm9mZnNldCArIG5hbWUtPm5hbWVSZWNvcmRzW2pdLmxlbmd0aCkKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgdW5zaWduZWQgc2hvcnQgbmFtZUxlbmd0aCA9IG5hbWUtPm5hbWVS ZWNvcmRzW2pdLmxlbmd0aDsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBCaWdF bmRpYW5VU2hvcnQqIG5hbWVTdHJpbmcgPSByZWludGVycHJldF9jYXN0PGNvbnN0IEJpZ0VuZGlh blVTaG9ydCo+KGRhdGEgKyB0YWJsZU9mZnNldCArIG5hbWUtPnN0cmluZ09mZnNldCArIG5hbWUt Pm5hbWVSZWNvcmRzW2pdLm9mZnNldCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgc3dpdGNoIChuYW1lLT5uYW1lUmVjb3Jkc1tqXS5u YW1lSUQpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2FzZSAxOgotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmFtaWx5TmFtZUxlbmd0aCA9IG5hbWVMZW5n dGg7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmYW1pbHlOYW1lID0gbmFt ZVN0cmluZzsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjYXNlIDI6Ci0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzdWJmYW1pbHlOYW1lTGVuZ3RoID0gbmFtZUxlbmd0aDsKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN1YmZhbWlseU5hbWUgPSBuYW1lU3RyaW5n OwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGNhc2UgNDoKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGZ1bGxOYW1lTGVuZ3RoID0gbmFtZUxlbmd0aDsKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGZ1bGxOYW1lID0gbmFtZVN0cmluZzsKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBjYXNlIDU6Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2ZXJzaW9u U3RyaW5nTGVuZ3RoID0gbmFtZUxlbmd0aDsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHZlcnNpb25TdHJpbmcgPSBuYW1lU3RyaW5nOwotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRl ZmF1bHQ6Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICAgICAgICB9Ci0gICAg ICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAg ICAgICAgfQotICAgICAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgICAgICBicmVhazsKLSAg ICAgICAgfQotICAgICAgICBpZiAoaGF2ZU9TMiAmJiBoYXZlSGVhZCAmJiBoYXZlTmFtZSkKLSAg ICAgICAgICAgIGJyZWFrOwotICAgIH0KLQotICAgIHByZWZpeC0+Y2hhcnNldCA9IERFRkFVTFRf Q0hBUlNFVDsKLSAgICBwcmVmaXgtPm1hZ2ljTnVtYmVyID0gMHg1MDRjOwotICAgIHByZWZpeC0+ cmVzZXJ2ZWRbMF0gPSAwOwotICAgIHByZWZpeC0+cmVzZXJ2ZWRbMV0gPSAwOwotICAgIHByZWZp eC0+cmVzZXJ2ZWRbMl0gPSAwOwotICAgIHByZWZpeC0+cmVzZXJ2ZWRbM10gPSAwOwotICAgIHBy ZWZpeC0+cGFkZGluZzEgPSAwOwotCi0gICAgZW90SGVhZGVyLmFwcGVuZEJpZ0VuZGlhblN0cmlu ZyhmYW1pbHlOYW1lLCBmYW1pbHlOYW1lTGVuZ3RoKTsKLSAgICBlb3RIZWFkZXIuYXBwZW5kQmln RW5kaWFuU3RyaW5nKHN1YmZhbWlseU5hbWUsIHN1YmZhbWlseU5hbWVMZW5ndGgpOwotICAgIGVv dEhlYWRlci5hcHBlbmRCaWdFbmRpYW5TdHJpbmcodmVyc2lvblN0cmluZywgdmVyc2lvblN0cmlu Z0xlbmd0aCk7Ci0KLSAgICAvLyBJZiBwb3NzaWJsZSwgZW5zdXJlIHRoYXQgdGhlIGZhbWlseSBu YW1lIGlzIGEgcHJlZml4IG9mIHRoZSBmdWxsIG5hbWUuCi0gICAgaWYgKGZ1bGxOYW1lTGVuZ3Ro ID49IGZhbWlseU5hbWVMZW5ndGggJiYgbWVtY21wKGZhbWlseU5hbWUsIGZ1bGxOYW1lLCBmYW1p bHlOYW1lTGVuZ3RoKSkgewotICAgICAgICBvdmVybGF5U3JjID0gcmVpbnRlcnByZXRfY2FzdDxj b25zdCB1aW50OF90Kj4oZnVsbE5hbWUpIC0gZGF0YTsKLSAgICAgICAgb3ZlcmxheURzdCA9IHJl aW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDhfdCo+KGZhbWlseU5hbWUpIC0gZGF0YTsKLSAgICAg ICAgb3ZlcmxheUxlbmd0aCA9IGZhbWlseU5hbWVMZW5ndGg7Ci0gICAgfQotICAgIGVvdEhlYWRl ci5hcHBlbmRCaWdFbmRpYW5TdHJpbmcoZnVsbE5hbWUsIGZ1bGxOYW1lTGVuZ3RoKTsKLQotICAg IGVvdEhlYWRlci5hcHBlbmRQYWRkaW5nU2hvcnQoKTsKLSAgICBlb3RIZWFkZXIudXBkYXRlRU9U U2l6ZShmb250RGF0YS0+c2l6ZSgpKTsKLQotICAgIHJldHVybiB0cnVlOwotfQotCiAvLyBhZGRz IGZvbnROYW1lIHRvIHRoZSBmb250IHRhYmxlIGluIGZvbnREYXRhLCBhbmQgd3JpdGVzIHRoZSBu ZXcgZm9udCB0YWJsZSB0byByZXdyaXR0ZW5Gb250VGFibGUKIC8vIHJldHVybnMgdGhlIHNpemUg b2YgdGhlIG5hbWUgdGFibGUgKHdoaWNoIGlzIHVzZWQgYnkgcmVuYW1lQW5kQWN0aXZhdGVGb250 KSwgb3IgMCBvbiBlYXJseSBhYm9ydAogYm9vbCByZW5hbWVGb250KGNvbnN0IFNoYXJlZEJ1ZmZl ciYgZm9udERhdGEsIGNvbnN0IFN0cmluZyYgZm9udE5hbWUsIFZlY3Rvcjx1aW50OF90PiYgcmV3 cml0dGVuRm9udERhdGEpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9vcGVudHlwZS9PcGVuVHlwZVV0aWxpdGllcy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvb3BlbnR5cGUvT3BlblR5cGVVdGlsaXRpZXMuaAppbmRleCBmY2YxZjI3MjJm YjUxNzYyN2FlNmNjMjc3MWYyMjBkMGYyOTc4NzcyLi4wOWMxYzQ1YzQ1OTNhZWE0MzE4MzBkMjE1 YjdlNzQ4NTJjMTllMzdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9vcGVudHlwZS9PcGVuVHlwZVV0aWxpdGllcy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL29wZW50eXBlL09wZW5UeXBlVXRpbGl0aWVzLmgKQEAgLTU0LDcgKzU0 LDYgQEAgcHJpdmF0ZToKICAgICBWZWN0b3I8dWludDhfdCwgNTEyPiBtX2J1ZmZlcjsKIH07CiAK LWJvb2wgZ2V0RU9USGVhZGVyKFNoYXJlZEJ1ZmZlciogZm9udERhdGEsIEVPVEhlYWRlciYgZW90 SGVhZGVyLCBzaXplX3QmIG92ZXJsYXlEc3QsIHNpemVfdCYgb3ZlcmxheVNyYywgc2l6ZV90JiBv dmVybGF5TGVuZ3RoKTsKIGJvb2wgcmVuYW1lRm9udChjb25zdCBTaGFyZWRCdWZmZXImLCBjb25z dCBTdHJpbmcmLCBWZWN0b3I8dWludDhfdD4mKTsKIFJlZlB0cjxGb250TWVtb3J5UmVzb3VyY2U+ IHJlbmFtZUFuZEFjdGl2YXRlRm9udChjb25zdCBTaGFyZWRCdWZmZXImLCBjb25zdCBTdHJpbmcm KTsKIAo= 444939 2021-11-21 21:25:32 -0800 2021-11-22 12:35:14 -0800 Patch bug-233411-20211122162531.patch text/plain 8865 jean-yves.avenard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmQxZGQyNzIyYjVlNjhm ODAyNjAxZDY5NmRmNWE2NGYzZGIwMjhmNC4uNjk0ODRmOGZlNzUxZDY1OWZkNTQwYmU3ZDIxNDY1 MWY3OWU5NjMzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTExLTIxICBKZWFu LVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHVudXNlZCBn ZXRFT1RIZWFkZXIgbWV0aG9kIGluIE9wZW5UeXBlVXRpbGl0aWVzLmNwcAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzNDExCisgICAgICAgIHJkYXI6 Ly84NTY1NjgyNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE5vIGNoYW5nZSBpbiBiZWhhdmlvdXIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9vcGVudHlwZS9PcGVuVHlwZVV0aWxpdGllcy5jcHA6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3Mvb3BlbnR5cGUvT3BlblR5cGVVdGlsaXRpZXMuaDoKKwogMjAyMS0xMS0yMSAgSmVhbi1Z dmVzIEF2ZW5hcmQgIDxqeWFAYXBwbGUuY29tPgogCiAgICAgICAgIERpc3Rpbmd1aXNoIGNvbnRp Z3VvdXMgU2hhcmVkQnVmZmVyIGZyb20gbm9uLWNvbnRpZ3VvdXMgb25lIGFuZCBndWFyYW50ZWUg aW1tdXRhYmlsaXR5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9vcGVudHlwZS9PcGVuVHlwZVV0aWxpdGllcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9vcGVudHlwZS9PcGVuVHlwZVV0aWxpdGllcy5jcHAKaW5kZXggNmQwMzg2M2Iz NjZjMjQ1ZjQ0MmY3NDM5MzcxOWFiZWFkYTVjNGIyMC4uMzIxNmI3ZWYwNmU5YTQ4MDA5OTE1OTIz MDU2YWNhM2ZjYmY5MmQxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3Mvb3BlbnR5cGUvT3BlblR5cGVVdGlsaXRpZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL29wZW50eXBlL09wZW5UeXBlVXRpbGl0aWVzLmNwcApAQCAtMTk3 LDE1NSArMTk3LDYgQEAgdm9pZCBFT1RIZWFkZXI6OmFwcGVuZFBhZGRpbmdTaG9ydCgpCiAgICAg bV9idWZmZXIuYXBwZW5kKHJlaW50ZXJwcmV0X2Nhc3Q8dWludDhfdCo+KCZwYWRkaW5nKSwgc2l6 ZW9mKHBhZGRpbmcpKTsKIH0KIAotYm9vbCBnZXRFT1RIZWFkZXIoU2hhcmVkQnVmZmVyKiBmb250 RGF0YSwgRU9USGVhZGVyJiBlb3RIZWFkZXIsIHNpemVfdCYgb3ZlcmxheURzdCwgc2l6ZV90JiBv dmVybGF5U3JjLCBzaXplX3QmIG92ZXJsYXlMZW5ndGgpCi17Ci0gICAgb3ZlcmxheURzdCA9IDA7 Ci0gICAgb3ZlcmxheVNyYyA9IDA7Ci0gICAgb3ZlcmxheUxlbmd0aCA9IDA7Ci0KLSAgICBzaXpl X3QgZGF0YUxlbmd0aCA9IGZvbnREYXRhLT5zaXplKCk7Ci0gICAgYXV0byogZGF0YSA9IGZvbnRE YXRhLT5kYXRhKCk7Ci0KLSAgICBFT1RQcmVmaXgqIHByZWZpeCA9IGVvdEhlYWRlci5wcmVmaXgo KTsKLQotICAgIHByZWZpeC0+Zm9udERhdGFTaXplID0gZGF0YUxlbmd0aDsKLSAgICBwcmVmaXgt PnZlcnNpb24gPSAweDAwMDIwMDAxOwotICAgIHByZWZpeC0+ZmxhZ3MgPSAwOwotCi0gICAgaWYg KGRhdGFMZW5ndGggPCBvZmZzZXRvZihzZm50SGVhZGVyLCB0YWJsZXMpKQotICAgICAgICByZXR1 cm4gZmFsc2U7Ci0KLSAgICBjb25zdCBzZm50SGVhZGVyKiBzZm50ID0gcmVpbnRlcnByZXRfY2Fz dDxjb25zdCBzZm50SGVhZGVyKj4oZGF0YSk7Ci0KLSAgICBpZiAoZGF0YUxlbmd0aCA8IG9mZnNl dG9mKHNmbnRIZWFkZXIsIHRhYmxlcykgKyBzZm50LT5udW1UYWJsZXMgKiBzaXplb2YoVGFibGVE aXJlY3RvcnlFbnRyeSkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIGJvb2wgaGF2ZU9T MiA9IGZhbHNlOwotICAgIGJvb2wgaGF2ZUhlYWQgPSBmYWxzZTsKLSAgICBib29sIGhhdmVOYW1l ID0gZmFsc2U7Ci0KLSAgICBjb25zdCBCaWdFbmRpYW5VU2hvcnQqIGZhbWlseU5hbWUgPSAwOwot ICAgIHVuc2lnbmVkIHNob3J0IGZhbWlseU5hbWVMZW5ndGggPSAwOwotICAgIGNvbnN0IEJpZ0Vu ZGlhblVTaG9ydCogc3ViZmFtaWx5TmFtZSA9IDA7Ci0gICAgdW5zaWduZWQgc2hvcnQgc3ViZmFt aWx5TmFtZUxlbmd0aCA9IDA7Ci0gICAgY29uc3QgQmlnRW5kaWFuVVNob3J0KiBmdWxsTmFtZSA9 IDA7Ci0gICAgdW5zaWduZWQgc2hvcnQgZnVsbE5hbWVMZW5ndGggPSAwOwotICAgIGNvbnN0IEJp Z0VuZGlhblVTaG9ydCogdmVyc2lvblN0cmluZyA9IDA7Ci0gICAgdW5zaWduZWQgc2hvcnQgdmVy c2lvblN0cmluZ0xlbmd0aCA9IDA7Ci0KLSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgc2Zu dC0+bnVtVGFibGVzOyBpKyspIHsKLSAgICAgICAgdW5zaWduZWQgdGFibGVPZmZzZXQgPSBzZm50 LT50YWJsZXNbaV0ub2Zmc2V0OwotICAgICAgICB1bnNpZ25lZCB0YWJsZUxlbmd0aCA9IHNmbnQt PnRhYmxlc1tpXS5sZW5ndGg7Ci0KLSAgICAgICAgaWYgKGRhdGFMZW5ndGggPCB0YWJsZU9mZnNl dCB8fCBkYXRhTGVuZ3RoIDwgdGFibGVMZW5ndGggfHwgZGF0YUxlbmd0aCA8IHRhYmxlT2Zmc2V0 ICsgdGFibGVMZW5ndGgpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICAgICAgdW5z aWduZWQgdGFibGVUYWcgPSBzZm50LT50YWJsZXNbaV0udGFnOwotICAgICAgICBzd2l0Y2ggKHRh YmxlVGFnKSB7Ci0gICAgICAgICAgICBjYXNlICdPUy8yJzoKLSAgICAgICAgICAgICAgICB7Ci0g ICAgICAgICAgICAgICAgICAgIGlmIChkYXRhTGVuZ3RoIDwgdGFibGVPZmZzZXQgKyBzaXplb2Yo T1MyVGFibGUpKQotICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAg ICAgICAgICAgICAgICAgIGhhdmVPUzIgPSB0cnVlOwotICAgICAgICAgICAgICAgICAgICBjb25z dCBPUzJUYWJsZSogT1MyID0gcmVpbnRlcnByZXRfY2FzdDxjb25zdCBPUzJUYWJsZSo+KGRhdGEg KyB0YWJsZU9mZnNldCk7Ci0gICAgICAgICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaiA9IDA7 IGogPCAxMDsgaisrKQotICAgICAgICAgICAgICAgICAgICAgICAgcHJlZml4LT5mb250UEFOT1NF W2pdID0gT1MyLT5wYW5vc2Vbal07Ci0gICAgICAgICAgICAgICAgICAgIHByZWZpeC0+aXRhbGlj ID0gT1MyLT5mc1NlbGVjdGlvbiAmIDB4MDE7Ci0gICAgICAgICAgICAgICAgICAgIHByZWZpeC0+ d2VpZ2h0ID0gT1MyLT53ZWlnaHRDbGFzczsKLSAgICAgICAgICAgICAgICAgICAgLy8gRklYTUU6 IFNob3VsZCB1c2UgT1MyLT5mc1R5cGUsIGJ1dCBzb21lIFRydWVUeXBlIGZvbnRzIHNldCBpdCB0 byBhbiBvdmVyLXJlc3RyaWN0aXZlIHZhbHVlLgotICAgICAgICAgICAgICAgICAgICAvLyBTaW5j ZSBBVFMgZG9lcyBub3QgZW5mb3JjZSB0aGlzIG9uIE1hYyBPUyBYLCB3ZSBkbyBub3QgZW5mb3Jj ZSBpdCBlaXRoZXIuCi0gICAgICAgICAgICAgICAgICAgIHByZWZpeC0+ZnNUeXBlID0gMDsgICAg ICAgICAgICAKLSAgICAgICAgICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBqID0gMDsgaiA8IDQ7 IGorKykKLSAgICAgICAgICAgICAgICAgICAgICAgIHByZWZpeC0+dW5pY29kZVJhbmdlW2pdID0g T1MyLT51bmljb2RlUmFuZ2Vbal07Ci0gICAgICAgICAgICAgICAgICAgIGZvciAodW5zaWduZWQg aiA9IDA7IGogPCAyOyBqKyspCi0gICAgICAgICAgICAgICAgICAgICAgICBwcmVmaXgtPmNvZGVQ YWdlUmFuZ2Vbal0gPSBPUzItPmNvZGVQYWdlUmFuZ2Vbal07Ci0gICAgICAgICAgICAgICAgICAg IGJyZWFrOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGNhc2UgJ2hlYWQnOgotICAg ICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKGRhdGFMZW5ndGggPCB0YWJs ZU9mZnNldCArIHNpemVvZihoZWFkVGFibGUpKQotICAgICAgICAgICAgICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOwotCi0gICAgICAgICAgICAgICAgICAgIGhhdmVIZWFkID0gdHJ1ZTsKLSAgICAg ICAgICAgICAgICAgICAgY29uc3QgaGVhZFRhYmxlKiBoZWFkID0gcmVpbnRlcnByZXRfY2FzdDxj b25zdCBoZWFkVGFibGUqPihkYXRhICsgdGFibGVPZmZzZXQpOwotICAgICAgICAgICAgICAgICAg ICBwcmVmaXgtPmNoZWNrU3VtQWRqdXN0bWVudCA9IGhlYWQtPmNoZWNrU3VtQWRqdXN0bWVudDsK LSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAg ICAgY2FzZSAnbmFtZSc6Ci0gICAgICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICAgICBp ZiAoZGF0YUxlbmd0aCA8IHRhYmxlT2Zmc2V0ICsgb2Zmc2V0b2YobmFtZVRhYmxlLCBuYW1lUmVj b3JkcykpCi0gICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICAgICAg ICAgICAgICAgICAgaGF2ZU5hbWUgPSB0cnVlOwotICAgICAgICAgICAgICAgICAgICBjb25zdCBu YW1lVGFibGUqIG5hbWUgPSByZWludGVycHJldF9jYXN0PGNvbnN0IG5hbWVUYWJsZSo+KGRhdGEg KyB0YWJsZU9mZnNldCk7Ci0gICAgICAgICAgICAgICAgICAgIGZvciAoaW50IGogPSAwOyBqIDwg bmFtZS0+Y291bnQ7IGorKykgewotICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGRhdGFMZW5n dGggPCB0YWJsZU9mZnNldCArIG9mZnNldG9mKG5hbWVUYWJsZSwgbmFtZVJlY29yZHMpICsgKGog KyAxKSAqIHNpemVvZihuYW1lUmVjb3JkKSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiAobmFtZS0+bmFtZVJlY29y ZHNbal0ucGxhdGZvcm1JRCA9PSAzICYmIG5hbWUtPm5hbWVSZWNvcmRzW2pdLmVuY29kaW5nSUQg PT0gMSAmJiBuYW1lLT5uYW1lUmVjb3Jkc1tqXS5sYW5ndWFnZUlEID09IDB4MDQwOSkgewotICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChkYXRhTGVuZ3RoIDwgdGFibGVPZmZzZXQgKyBu YW1lLT5zdHJpbmdPZmZzZXQgKyBuYW1lLT5uYW1lUmVjb3Jkc1tqXS5vZmZzZXQgKyBuYW1lLT5u YW1lUmVjb3Jkc1tqXS5sZW5ndGgpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKLQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIHNob3J0 IG5hbWVMZW5ndGggPSBuYW1lLT5uYW1lUmVjb3Jkc1tqXS5sZW5ndGg7Ci0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgY29uc3QgQmlnRW5kaWFuVVNob3J0KiBuYW1lU3RyaW5nID0gcmVpbnRl cnByZXRfY2FzdDxjb25zdCBCaWdFbmRpYW5VU2hvcnQqPihkYXRhICsgdGFibGVPZmZzZXQgKyBu YW1lLT5zdHJpbmdPZmZzZXQgKyBuYW1lLT5uYW1lUmVjb3Jkc1tqXS5vZmZzZXQpOwotICAgICAg ICAgICAgICAgICAgICAgICAgICAgIAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN3aXRj aCAobmFtZS0+bmFtZVJlY29yZHNbal0ubmFtZUlEKSB7Ci0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGNhc2UgMToKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZh bWlseU5hbWVMZW5ndGggPSBuYW1lTGVuZ3RoOwotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZmFtaWx5TmFtZSA9IG5hbWVTdHJpbmc7Ci0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2Fz ZSAyOgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3ViZmFtaWx5TmFtZUxl bmd0aCA9IG5hbWVMZW5ndGg7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBz dWJmYW1pbHlOYW1lID0gbmFtZVN0cmluZzsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjYXNlIDQ6Ci0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmdWxsTmFtZUxlbmd0aCA9IG5hbWVM ZW5ndGg7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmdWxsTmFtZSA9IG5h bWVTdHJpbmc7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2FzZSA1OgotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdmVyc2lvblN0cmluZ0xlbmd0aCA9IG5hbWVMZW5ndGg7Ci0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2ZXJzaW9uU3RyaW5nID0gbmFtZVN0cmlu ZzsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgfQotICAgICAg ICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAg ICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGRlZmF1bHQ6Ci0g ICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKGhhdmVPUzIgJiYg aGF2ZUhlYWQgJiYgaGF2ZU5hbWUpCi0gICAgICAgICAgICBicmVhazsKLSAgICB9Ci0KLSAgICBw cmVmaXgtPmNoYXJzZXQgPSBERUZBVUxUX0NIQVJTRVQ7Ci0gICAgcHJlZml4LT5tYWdpY051bWJl ciA9IDB4NTA0YzsKLSAgICBwcmVmaXgtPnJlc2VydmVkWzBdID0gMDsKLSAgICBwcmVmaXgtPnJl c2VydmVkWzFdID0gMDsKLSAgICBwcmVmaXgtPnJlc2VydmVkWzJdID0gMDsKLSAgICBwcmVmaXgt PnJlc2VydmVkWzNdID0gMDsKLSAgICBwcmVmaXgtPnBhZGRpbmcxID0gMDsKLQotICAgIGVvdEhl YWRlci5hcHBlbmRCaWdFbmRpYW5TdHJpbmcoZmFtaWx5TmFtZSwgZmFtaWx5TmFtZUxlbmd0aCk7 Ci0gICAgZW90SGVhZGVyLmFwcGVuZEJpZ0VuZGlhblN0cmluZyhzdWJmYW1pbHlOYW1lLCBzdWJm YW1pbHlOYW1lTGVuZ3RoKTsKLSAgICBlb3RIZWFkZXIuYXBwZW5kQmlnRW5kaWFuU3RyaW5nKHZl cnNpb25TdHJpbmcsIHZlcnNpb25TdHJpbmdMZW5ndGgpOwotCi0gICAgLy8gSWYgcG9zc2libGUs IGVuc3VyZSB0aGF0IHRoZSBmYW1pbHkgbmFtZSBpcyBhIHByZWZpeCBvZiB0aGUgZnVsbCBuYW1l LgotICAgIGlmIChmdWxsTmFtZUxlbmd0aCA+PSBmYW1pbHlOYW1lTGVuZ3RoICYmIG1lbWNtcChm YW1pbHlOYW1lLCBmdWxsTmFtZSwgZmFtaWx5TmFtZUxlbmd0aCkpIHsKLSAgICAgICAgb3Zlcmxh eVNyYyA9IHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDhfdCo+KGZ1bGxOYW1lKSAtIGRhdGE7 Ci0gICAgICAgIG92ZXJsYXlEc3QgPSByZWludGVycHJldF9jYXN0PGNvbnN0IHVpbnQ4X3QqPihm YW1pbHlOYW1lKSAtIGRhdGE7Ci0gICAgICAgIG92ZXJsYXlMZW5ndGggPSBmYW1pbHlOYW1lTGVu Z3RoOwotICAgIH0KLSAgICBlb3RIZWFkZXIuYXBwZW5kQmlnRW5kaWFuU3RyaW5nKGZ1bGxOYW1l LCBmdWxsTmFtZUxlbmd0aCk7Ci0KLSAgICBlb3RIZWFkZXIuYXBwZW5kUGFkZGluZ1Nob3J0KCk7 Ci0gICAgZW90SGVhZGVyLnVwZGF0ZUVPVFNpemUoZm9udERhdGEtPnNpemUoKSk7Ci0KLSAgICBy ZXR1cm4gdHJ1ZTsKLX0KLQogLy8gYWRkcyBmb250TmFtZSB0byB0aGUgZm9udCB0YWJsZSBpbiBm b250RGF0YSwgYW5kIHdyaXRlcyB0aGUgbmV3IGZvbnQgdGFibGUgdG8gcmV3cml0dGVuRm9udFRh YmxlCiAvLyByZXR1cm5zIHRoZSBzaXplIG9mIHRoZSBuYW1lIHRhYmxlICh3aGljaCBpcyB1c2Vk IGJ5IHJlbmFtZUFuZEFjdGl2YXRlRm9udCksIG9yIDAgb24gZWFybHkgYWJvcnQKIGJvb2wgcmVu YW1lRm9udChjb25zdCBTaGFyZWRCdWZmZXImIGZvbnREYXRhLCBjb25zdCBTdHJpbmcmIGZvbnRO YW1lLCBWZWN0b3I8dWludDhfdD4mIHJld3JpdHRlbkZvbnREYXRhKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnR5cGUvT3BlblR5cGVVdGlsaXRpZXMu aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW50eXBlL09wZW5UeXBlVXRp bGl0aWVzLmgKaW5kZXggZmNmMWYyNzIyZmI1MTc2MjdhZTZjYzI3NzFmMjIwZDBmMjk3ODc3Mi4u MDljMWM0NWM0NTkzYWVhNDMxODMwZDIxNWI3ZTc0ODUyYzE5ZTM3ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnR5cGUvT3BlblR5cGVVdGlsaXRpZXMu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVudHlwZS9PcGVuVHlw ZVV0aWxpdGllcy5oCkBAIC01NCw3ICs1NCw2IEBAIHByaXZhdGU6CiAgICAgVmVjdG9yPHVpbnQ4 X3QsIDUxMj4gbV9idWZmZXI7CiB9OwogCi1ib29sIGdldEVPVEhlYWRlcihTaGFyZWRCdWZmZXIq IGZvbnREYXRhLCBFT1RIZWFkZXImIGVvdEhlYWRlciwgc2l6ZV90JiBvdmVybGF5RHN0LCBzaXpl X3QmIG92ZXJsYXlTcmMsIHNpemVfdCYgb3ZlcmxheUxlbmd0aCk7CiBib29sIHJlbmFtZUZvbnQo Y29uc3QgU2hhcmVkQnVmZmVyJiwgY29uc3QgU3RyaW5nJiwgVmVjdG9yPHVpbnQ4X3Q+Jik7CiBS ZWZQdHI8Rm9udE1lbW9yeVJlc291cmNlPiByZW5hbWVBbmRBY3RpdmF0ZUZvbnQoY29uc3QgU2hh cmVkQnVmZmVyJiwgY29uc3QgU3RyaW5nJik7CiAK