From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 From: Takao Fujiwara To: git-commits@fedoraproject.org Subject: [rpms/ibus] autotool: Fix Bug 1618682 - SEGV with ASCII on emojier in Wayland Date: Sun, 31 May 2026 02:06:58 GMT Message-ID: <178019321893.1.12256700967552974425.rpms-ibus-3a447b791643@fedoraproject.org> List-ID: X-Git-Repo: rpms/ibus X-Git-Branch: autotool X-Git-Rev: 3a447b7916433fa39d3885713cf537f6b53c5b7f ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvaWJ1cwogICAgICAgICAgICBCcmFuY2ggOiBhdXRvdG9vbAogICAgICAgICAg ICBDb21taXQgOiAzYTQ0N2I3OTE2NDMzZmEzOWQzODg1NzEzY2Y1MzdmNmI1M2M1YjdmCiAgICAg ICAgICAgIEF1dGhvciA6IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPgogICAg ICAgICAgICBEYXRlICAgOiAyMDE4LTA4LTMwVDEzOjQ0OjIyKzA5OjAwCiAgICAgICAgICAgIFN0 YXRzICA6ICszNjUvLTEgaW4gMiBmaWxlKHMpCiAgICAgICAgICAgIFVSTCAgICA6IGh0dHBzOi8v c3JjLmZlZG9yYXByb2plY3Qub3JnL3JwbXMvaWJ1cy9jLzNhNDQ3Yjc5MTY0MzNmYTM5ZDM4ODU3 MTNjZjUzN2Y2YjUzYzViN2Y/YnJhbmNoPWF1dG90b29sCgogICAgICAgICAgICBMb2c6CiAgICAg ICAgICAgIEZpeCBCdWcgMTYxODY4MiAtIFNFR1Ygd2l0aCBBU0NJSSBvbiBlbW9qaWVyIGluIFdh eWxhbmQKCi0gU3VwcG9ydCBTaGlmdC1TcGFjZSBvbiBlbW9qaWVyIHByZWVkaXQKLSBEbyBub3Qg bW92ZSBFbW9qaWVyIHBvcHVwIHdpdGggdGhlIGFjdGl2ZSBjYW5kaWRhdGUgaW4gWG9yZwoKLS0t CmRpZmYgLS1naXQgYS9pYnVzLUhFQUQucGF0Y2ggYi9pYnVzLUhFQUQucGF0Y2gKaW5kZXggYzk4 M2E0YS4uMmJiYWQ0YiAxMDA2NDQKLS0tIGEvaWJ1cy1IRUFELnBhdGNoCisrKyBiL2lidXMtSEVB RC5wYXRjaApAQCAtMzUsMyArMzUsMzYwIEBAIGluZGV4IDg1ZGNkY2ViLi42MzdhZTA0OSAxMDA2 NDQKIC0tIAogMi4xNy4xCiAKK0Zyb20gMjhkMjIxNzZhZWU2YmU5N2Q4OGRkNmM2MGZhNTM5NWM3 OTU2M2VjMCBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206IGZ1aml3YXJhdCA8dGFrYW8u ZnVqaXdhcmExQGdtYWlsLmNvbT4KK0RhdGU6IFRodSwgMzAgQXVnIDIwMTggMTI6NTc6MzMgKzA5 MDAKK1N1YmplY3Q6IFtQQVRDSF0gdWkvZ3RrMzogRml4IFNFR1Ygd2hlbiB0eXBlIEFTQ0lJIG9u IGVtb2ppZXIKKworRW1vamllciBzdGlsbCBpbmNsdWRlZCBHdGsuRW50cnksIGFjY2VwdGVkIGtl eSBldmVudHMgaW4gV2F5bGFuZCwKK3Jlc2V0IHRoZSBsb29rdXAgdGFibGUgYW5kIGl0IGNhdXNl ZCBTRUdWIGJlY2F1c2UgSUJ1cy5UZXh0CitpcyBOVUxMIGluIHRoZSBsb29rdXAgdGFibGUgaW4g RW1vamllci5nZXRfY3VycmVudF9jYW5kaWRhdGUoKS4KK05vdyBHdGsuRW50cnkgaXMgZGVsZXRl ZCBjb21wbGV0ZWx5LgorCitCVUc9cmhieiMxNjE4NjgyCistLS0KKyB1aS9ndGszL2Vtb2ppZXIu dmFsYSB8IDEzOSArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCisg MSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxMzggZGVsZXRpb25zKC0pCisKK2RpZmYg LS1naXQgYS91aS9ndGszL2Vtb2ppZXIudmFsYSBiL3VpL2d0azMvZW1vamllci52YWxhCitpbmRl eCA2MzdhZTA0OS4uMGY0NTU4MDAgMTAwNjQ0CistLS0gYS91aS9ndGszL2Vtb2ppZXIudmFsYQor KysrIGIvdWkvZ3RrMy9lbW9qaWVyLnZhbGEKK0BAIC0yODMsNyArMjgzLDYgQEAgcHVibGljIGNs YXNzIElCdXNFbW9qaWVyIDogR3RrLkFwcGxpY2F0aW9uV2luZG93IHsKKyAKKyAgICAgcHJpdmF0 ZSBUaGVtZWRSR0JBIG1fcmdiYTsKKyAgICAgcHJpdmF0ZSBHdGsuQm94IG1fdmJveDsKKy0gICAg cHJpdmF0ZSBFRW50cnkgbV9lbnRyeTsKKyAgICAgLyogSWYgZW1vamllciBpcyBlbW9qaSBjYXRl Z29yeSBsaXN0IG9yIFVuaWNvZGUgY2F0ZWdvcnkgbGlzdCwKKyAgICAgICogbV9hbm5vdGF0aW9u IGlzICIiIGFuZCBwcmVlZGl0IGlzIGFsc28gIiIuCisgICAgICAqIElmIGVtb2ppZXIgaXMgY2Fu ZGlkYXRlIG1vZGUsIG1fYW5ub3RhdGlvbiBpcyBhbiBhbm5vdGF0aW9uIGFuZAorQEAgLTM2Nywy MyArMzY2LDYgQEAgcHVibGljIGNsYXNzIElCdXNFbW9qaWVyIDogR3RrLkFwcGxpY2F0aW9uV2lu ZG93IHsKKyAgICAgICAgIG1fdmJveCA9IG5ldyBHdGsuQm94KEd0ay5PcmllbnRhdGlvbi5WRVJU SUNBTCwgMCk7CisgICAgICAgICBhZGQobV92Ym94KTsKKyAKKy0gICAgICAgIG1fZW50cnkgPSBu ZXcgRUVudHJ5KCk7CistICAgICAgICBtX2VudHJ5LnNldF9wbGFjZWhvbGRlcl90ZXh0KF8oIlR5 cGUgYW5ub3RhdGlvbiBvciBjaG9vc2UgZW1vamkiKSk7CistICAgICAgICAvL21fdmJveC5hZGQo bV9lbnRyeSk7CistICAgICAgICBtX2VudHJ5LmNoYW5nZWQuY29ubmVjdCgoKSA9PiB7CistICAg ICAgICAgICAgdXBkYXRlX2NhbmRpZGF0ZV93aW5kb3coKTsKKy0gICAgICAgIH0pOworLSAgICAg ICAgbV9lbnRyeS5pY29uX3JlbGVhc2UuY29ubmVjdCgoaWNvbl9wb3MsIGV2ZW50KSA9PiB7Cist ICAgICAgICAgICAgaGlkZV9jYW5kaWRhdGVfcGFuZWwoKTsKKy0gICAgICAgIH0pOworLQorLSAg ICAgICAgLyogU2V0IHRoZSBhY2Nlc3NpYmxlIHJvbGUgb2YgdGhlIGxhYmVsIHRvIGEgc3RhdHVz IGJhciBzbyBpdAorLSAgICAgICAgICogd2lsbCBlbWl0IG5hbWUgY2hhbmdlZCBldmVudHMgdGhh dCBjYW4gYmUgdXNlZCBieSBzY3JlZW4KKy0gICAgICAgICAqIHJlYWRlcnMuCistICAgICAgICAg Ki8KKy0gICAgICAgIEF0ay5PYmplY3Qgb2JqID0gbV9lbnRyeS5nZXRfYWNjZXNzaWJsZSgpOwor LSAgICAgICAgb2JqLnNldF9yb2xlIChBdGsuUm9sZS5TVEFUVVNCQVIpOworLQorICAgICAgICAg Ly8gVGhlIGNvbnN0cnVjdG9yIG9mIElCdXMuTG9va3VwVGFibGUgZG9lcyBub3Qgc3VwcG9ydCBt b3JlIHRoYW4KKyAgICAgICAgIC8vIDE2IHBhZ2VzLgorICAgICAgICAgbV9sb29rdXBfdGFibGUg PSBuZXcgSUJ1cy5Mb29rdXBUYWJsZSgxLCAwLCB0cnVlLCB0cnVlKTsKK0BAIC0xODA2LDE4ICsx Nzg4LDYgQEAgcHVibGljIGNsYXNzIElCdXNFbW9qaWVyIDogR3RrLkFwcGxpY2F0aW9uV2luZG93 IHsKKyAgICAgICAgICAgICAgICAgbV9sb29rdXBfdGFibGUuY3Vyc29yX3VwKCk7CisgICAgICAg ICAgICAgZWxzZSBpZiAoa2V5dmFsID09IEdkay5LZXkuUmlnaHQpCisgICAgICAgICAgICAgICAg IG1fbG9va3VwX3RhYmxlLmN1cnNvcl9kb3duKCk7CistICAgICAgICB9IGVsc2UgaWYgKG1fZW50 cnkuZ2V0X3RleHQoKS5sZW5ndGggPiAwKSB7CistICAgICAgICAgICAgaW50IHN0ZXAgPSAwOwor LSAgICAgICAgICAgIGlmIChrZXl2YWwgPT0gR2RrLktleS5MZWZ0KQorLSAgICAgICAgICAgICAg ICBzdGVwID0gLTE7CistICAgICAgICAgICAgZWxzZSBpZiAoa2V5dmFsID09IEdkay5LZXkuUmln aHQpCistICAgICAgICAgICAgICAgIHN0ZXAgPSAxOworLSAgICAgICAgICAgIEdMaWIuU2lnbmFs LmVtaXRfYnlfbmFtZSgKKy0gICAgICAgICAgICAgICAgICAgIG1fZW50cnksICJtb3ZlLWN1cnNv ciIsCistICAgICAgICAgICAgICAgICAgICBHdGsuTW92ZW1lbnRTdGVwLlZJU1VBTF9QT1NJVElP TlMsCistICAgICAgICAgICAgICAgICAgICBzdGVwLAorLSAgICAgICAgICAgICAgICAgICAgKG1v ZGlmaWVycyAmIEdkay5Nb2RpZmllclR5cGUuU0hJRlRfTUFTSykgIT0gMAorLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICA/IHRydWUgOiBmYWxzZSk7CisgICAgICAgICB9IGVsc2UgeworICAg ICAgICAgICAgIC8vIEZvciBHZGsuS2V5LmYgYW5kIEdkay5LZXkuYgorICAgICAgICAgICAgIGlm IChrZXl2YWwgPT0gR2RrLktleS5MZWZ0KQorQEAgLTE4ODAsMjAgKzE4NTAsNiBAQCBwdWJsaWMg Y2xhc3MgSUJ1c0Vtb2ppZXIgOiBHdGsuQXBwbGljYXRpb25XaW5kb3cgeworICAgICAgICAgICAg IH0KKyAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgIH0KKy0gICAgICAgIGlmICht X2VudHJ5LmdldF90ZXh0KCkubGVuZ3RoID4gMCkgeworLSAgICAgICAgICAgIGludCBzdGVwID0g MDsKKy0gICAgICAgICAgICBpZiAoa2V5dmFsID09IEdkay5LZXkuSG9tZSkKKy0gICAgICAgICAg ICAgICAgc3RlcCA9IC0xOworLSAgICAgICAgICAgIGVsc2UgaWYgKGtleXZhbCA9PSBHZGsuS2V5 LkVuZCkKKy0gICAgICAgICAgICAgICAgc3RlcCA9IDE7CistICAgICAgICAgICAgR0xpYi5TaWdu YWwuZW1pdF9ieV9uYW1lKAorLSAgICAgICAgICAgICAgICAgICAgbV9lbnRyeSwgIm1vdmUtY3Vy c29yIiwKKy0gICAgICAgICAgICAgICAgICAgIEd0ay5Nb3ZlbWVudFN0ZXAuRElTUExBWV9MSU5F X0VORFMsCistICAgICAgICAgICAgICAgICAgICBzdGVwLAorLSAgICAgICAgICAgICAgICAgICAg KG1vZGlmaWVycyAmIEdkay5Nb2RpZmllclR5cGUuU0hJRlRfTUFTSykgIT0gMAorLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICA/IHRydWUgOiBmYWxzZSk7CistICAgICAgICAgICAgcmV0dXJu IHRydWU7CistICAgICAgICB9CisgICAgICAgICByZXR1cm4gY2F0ZWdvcnlfbGlzdF9jdXJzb3Jf bW92ZShrZXl2YWwpOworICAgICB9CisgCitAQCAtMTk0MSwyOCArMTg5Nyw2IEBAIHB1YmxpYyBj bGFzcyBJQnVzRW1vamllciA6IEd0ay5BcHBsaWNhdGlvbldpbmRvdyB7CisgICAgIH0KKyAKKyAK Ky0gICAgcHJpdmF0ZSB2b2lkIGVudHJ5X2VudGVyX2tleXZhbCh1aW50IGtleXZhbCkgeworLSAg ICAgICAgdW5pY2hhciBjaCA9IElCdXMua2V5dmFsX3RvX3VuaWNvZGUoa2V5dmFsKTsKKy0gICAg ICAgIGlmIChjaC5pc2NudHJsKCkpCistICAgICAgICAgICAgcmV0dXJuOworLSAgICAgICAgc3Ry aW5nIHN0ciA9IGNoLnRvX3N0cmluZygpOworLQorLSAgICAgICAgLy8gd2hhdCBndGtfZW50cnlf Y29tbWl0X2NiKCkgZG8KKy0gICAgICAgIGlmIChtX2VudHJ5LmdldF9zZWxlY3Rpb25fYm91bmRz KG51bGwsIG51bGwpKSB7CistICAgICAgICAgICAgbV9lbnRyeS5kZWxldGVfc2VsZWN0aW9uKCk7 CistICAgICAgICB9IGVsc2UgeworLSAgICAgICAgICAgIGlmIChtX2VudHJ5LmdldF9vdmVyd3Jp dGVfbW9kZSgpKSB7CistICAgICAgICAgICAgICAgdWludCB0ZXh0X2xlbmd0aCA9IG1fZW50cnku Z2V0X2J1ZmZlcigpLmdldF9sZW5ndGgoKTsKKy0gICAgICAgICAgICAgICBpZiAobV9lbnRyeS5j dXJzb3JfcG9zaXRpb24gPCB0ZXh0X2xlbmd0aCkKKy0gICAgICAgICAgICAgICAgICAgbV9lbnRy eS5kZWxldGVfZnJvbV9jdXJzb3IoR3RrLkRlbGV0ZVR5cGUuQ0hBUlMsIDEpOworLSAgICAgICAg ICAgIH0KKy0gICAgICAgIH0KKy0gICAgICAgIGludCBwb3MgPSBtX2VudHJ5LmdldF9wb3NpdGlv bigpOworLSAgICAgICAgbV9lbnRyeS5pbnNlcnRfdGV4dChzdHIsIC0xLCByZWYgcG9zKTsKKy0g ICAgICAgIG1fZW50cnkuc2V0X3Bvc2l0aW9uKHBvcyk7CistICAgIH0KKy0KKy0KKyAgICAgcHJp dmF0ZSBHZGsuUmVjdGFuZ2xlIGdldF9tb25pdG9yX2dlb21ldHJ5KCkgeworICAgICAgICAgR2Rr LlJlY3RhbmdsZSBtb25pdG9yX2FyZWEgPSB7IDAsIH07CisgCitAQCAtMjI0NSwxMCArMjE3OSw3 IEBAIHB1YmxpYyBjbGFzcyBJQnVzRW1vamllciA6IEd0ay5BcHBsaWNhdGlvbldpbmRvdyB7Cisg ICAgICAgICAvKiBMZXQgZ3RrIHJlY2FsY3VsYXRlIHRoZSB3aW5kb3cgc2l6ZS4gKi8KKyAgICAg ICAgIHJlc2l6ZSgxLCAxKTsKKyAKKy0gICAgICAgIG1fZW50cnkuc2V0X3RleHQoIiIpOworLQor ICAgICAgICAgc2hvd19jYXRlZ29yeV9saXN0KCk7CistICAgICAgICBtX2VudHJ5LnNldF9hY3Rp dmF0ZXNfZGVmYXVsdCh0cnVlKTsKKyAgICAgICAgIHNob3dfYWxsKCk7CisgCisgICAgICAgICAv KiBTb21lIHdpbmRvdyBtYW5hZ2VycywgZS5nLiBNQVRFLCBHTk9NRSwgUGxhc21hIGRlc2t0b3Bz LAorQEAgLTIyODksMTMgKzIyMjAsNiBAQCBwdWJsaWMgY2xhc3MgSUJ1c0Vtb2ppZXIgOiBHdGsu QXBwbGljYXRpb25XaW5kb3cgeworICAgICAgICAgbV9sb29wLnJ1bigpOworICAgICAgICAgbV9s b29wID0gbnVsbDsKKyAKKy0gICAgICAgIC8vIE5lZWQgZm9jdXMtb3V0IG9uIEd0ay5FbnRyeSB0 byBzZW5kIHRoZSBlbW9qaSB0byBhcHBsaWNhdGlvbnMuCistICAgICAgICBHZGsuRXZlbnQgZmV2 ZW50ID0gbmV3IEdkay5FdmVudChHZGsuRXZlbnRUeXBlLkZPQ1VTX0NIQU5HRSk7CistICAgICAg ICBmZXZlbnQuZm9jdXNfY2hhbmdlLmluID0gMDsKKy0gICAgICAgIGZldmVudC5mb2N1c19jaGFu Z2Uud2luZG93ICA9IGdldF93aW5kb3coKTsKKy0gICAgICAgIG1fZW50cnkuc2VuZF9mb2N1c19j aGFuZ2UoZmV2ZW50KTsKKy0gICAgICAgIGZldmVudC5mb2N1c19jaGFuZ2Uud2luZG93ICA9IG51 bGw7CistCisgICAgICAgICBoaWRlKCk7CisgICAgICAgICAvLyBNYWtlIHN1cmUgdGhlIHN3aXRj aGVyIGlzIGhpZGRlbiBiZWZvcmUgcmV0dXJuaW5nIGZyb20gdGhpcyBmdW5jdGlvbi4KKyAgICAg ICAgIHdoaWxlIChHdGsuZXZlbnRzX3BlbmRpbmcoKSkKK0BAIC0yMzU3LDM2ICsyMjgxLDkgQEAg cHVibGljIGNsYXNzIElCdXNFbW9qaWVyIDogR3RrLkFwcGxpY2F0aW9uV2luZG93IHsKKyAgICAg ICAgICAgICAgICAgaGlkZSgpOworICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKKy0gICAgICAgIGNhc2UgR2RrLktleS5CYWNrU3BhY2U6CistICAgICAgICAgICAgaWYg KG1fZW50cnkuZ2V0X3RleHQoKS5sZW5ndGggPiAwKSB7CistICAgICAgICAgICAgICAgIGlmICgo bW9kaWZpZXJzICYgR2RrLk1vZGlmaWVyVHlwZS5DT05UUk9MX01BU0spICE9IDApIHsKKy0gICAg ICAgICAgICAgICAgICAgIEdMaWIuU2lnbmFsLmVtaXRfYnlfbmFtZShtX2VudHJ5LCAiZGVsZXRl LWZyb20tY3Vyc29yIiwKKy0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBHdGsuRGVsZXRlVHlwZS5XT1JEX0VORFMsIC0xKTsKKy0gICAgICAgICAgICAgICAgfSBl bHNlIHsKKy0gICAgICAgICAgICAgICAgICAgIEdMaWIuU2lnbmFsLmVtaXRfYnlfbmFtZShtX2Vu dHJ5LCAiYmFja3NwYWNlIik7CistICAgICAgICAgICAgICAgIH0KKy0gICAgICAgICAgICAgICAg cmV0dXJuIHRydWU7CistICAgICAgICAgICAgfQorLSAgICAgICAgICAgIGJyZWFrOworLSAgICAg ICAgY2FzZSBHZGsuS2V5LkRlbGV0ZToKKy0gICAgICAgIGNhc2UgR2RrLktleS5LUF9EZWxldGU6 CistICAgICAgICAgICAgaWYgKG1fZW50cnkuZ2V0X3RleHQoKS5sZW5ndGggPiAwKSB7CistICAg ICAgICAgICAgICAgIGlmICgobW9kaWZpZXJzICYgR2RrLk1vZGlmaWVyVHlwZS5DT05UUk9MX01B U0spICE9IDApIHsKKy0gICAgICAgICAgICAgICAgICAgIEdMaWIuU2lnbmFsLmVtaXRfYnlfbmFt ZShtX2VudHJ5LCAiZGVsZXRlLWZyb20tY3Vyc29yIiwKKy0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBHdGsuRGVsZXRlVHlwZS5XT1JEX0VORFMsIDEpOworLSAg ICAgICAgICAgICAgICB9IGVsc2UgeworLSAgICAgICAgICAgICAgICAgICAgR0xpYi5TaWduYWwu ZW1pdF9ieV9uYW1lKG1fZW50cnksICJkZWxldGUtZnJvbS1jdXJzb3IiLAorLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEd0ay5EZWxldGVUeXBlLkNIQVJTLCAx KTsKKy0gICAgICAgICAgICAgICAgfQorLSAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKy0g ICAgICAgICAgICB9CistICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICBjYXNlIEdkay5LZXku c3BhY2U6CisgICAgICAgICBjYXNlIEdkay5LZXkuS1BfU3BhY2U6CistICAgICAgICAgICAgaWYg KChtb2RpZmllcnMgJiBHZGsuTW9kaWZpZXJUeXBlLlNISUZUX01BU0spICE9IDApIHsKKy0gICAg ICAgICAgICAgICAgaWYgKG1fZW50cnkuZ2V0X3RleHQoKS5sZW5ndGggPiAwKQorLSAgICAgICAg ICAgICAgICAgICAgZW50cnlfZW50ZXJfa2V5dmFsKGtleXZhbCk7CistICAgICAgICAgICAgfSBl bHNlIGlmIChtX2NhbmRpZGF0ZV9wYW5lbF9pc192aXNpYmxlKSB7CisrICAgICAgICAgICAgaWYg KG1fY2FuZGlkYXRlX3BhbmVsX2lzX3Zpc2libGUpIHsKKyAgICAgICAgICAgICAgICAgZW50ZXJf bm90aWZ5X2Rpc2FibGVfd2l0aF90aW1lcigpOworICAgICAgICAgICAgICAgICBtX2xvb2t1cF90 YWJsZS5jdXJzb3JfZG93bigpOworICAgICAgICAgICAgICAgICBzaG93X2NhbmRpZGF0ZV9wYW5l bCgpOworQEAgLTI0MzYsMTAgKzIzMzMsNiBAQCBwdWJsaWMgY2xhc3MgSUJ1c0Vtb2ppZXIgOiBH dGsuQXBwbGljYXRpb25XaW5kb3cgeworICAgICAgICAgICAgIGtleV9wcmVzc19jdXJzb3JfaG9t ZV9lbmQoR2RrLktleS5FbmQsIG1vZGlmaWVycyk7CisgICAgICAgICAgICAgc2hvd19hbGwoKTsK KyAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKy0gICAgICAgIGNhc2UgR2RrLktleS5JbnNlcnQ6 CistICAgICAgICBjYXNlIEdkay5LZXkuS1BfSW5zZXJ0OgorLSAgICAgICAgICAgIEdMaWIuU2ln bmFsLmVtaXRfYnlfbmFtZShtX2VudHJ5LCAidG9nZ2xlLW92ZXJ3cml0ZSIpOworLSAgICAgICAg ICAgIHJldHVybiB0cnVlOworICAgICAgICAgfQorIAorICAgICAgICAgaWYgKChtb2RpZmllcnMg JiBHZGsuTW9kaWZpZXJUeXBlLkNPTlRST0xfTUFTSykgIT0gMCkgeworQEAgLTI0NzAsMjcgKzIz NjMsNiBAQCBwdWJsaWMgY2xhc3MgSUJ1c0Vtb2ppZXIgOiBHdGsuQXBwbGljYXRpb25XaW5kb3cg eworICAgICAgICAgICAgICAgICBrZXlfcHJlc3NfY3Vyc29yX2hvbWVfZW5kKEdkay5LZXkuRW5k LCBtb2RpZmllcnMpOworICAgICAgICAgICAgICAgICBzaG93X2FsbCgpOworICAgICAgICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKKy0gICAgICAgICAgICBjYXNlIEdkay5LZXkudToKKy0gICAgICAg ICAgICAgICAgaWYgKG1fZW50cnkuZ2V0X3RleHQoKS5sZW5ndGggPiAwKSB7CistICAgICAgICAg ICAgICAgICAgICBHTGliLlNpZ25hbC5lbWl0X2J5X25hbWUobV9lbnRyeSwKKy0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiZGVsZXRlLWZyb20tY3Vyc29yIiwK Ky0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHdGsuRGVsZXRl VHlwZS5QQVJBR1JBUEhfRU5EUywKKy0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAtMSk7CistICAgICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKy0gICAg ICAgICAgICAgICAgfQorLSAgICAgICAgICAgICAgICBicmVhazsKKy0gICAgICAgICAgICBjYXNl IEdkay5LZXkuYToKKy0gICAgICAgICAgICAgICAgaWYgKG1fZW50cnkuZ2V0X3RleHQoKS5sZW5n dGggPiAwKSB7CistICAgICAgICAgICAgICAgICAgICBtX2VudHJ5LnNlbGVjdF9yZWdpb24oMCwg LTEpOworLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CistICAgICAgICAgICAgICAg IH0KKy0gICAgICAgICAgICAgICAgYnJlYWs7CistICAgICAgICAgICAgY2FzZSBHZGsuS2V5Lng6 CistICAgICAgICAgICAgICAgIGlmIChtX2VudHJ5LmdldF90ZXh0KCkubGVuZ3RoID4gMCkgewor LSAgICAgICAgICAgICAgICAgICAgR0xpYi5TaWduYWwuZW1pdF9ieV9uYW1lKG1fZW50cnksICJj dXQtY2xpcGJvYXJkIik7CistICAgICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKy0gICAg ICAgICAgICAgICAgfQorLSAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICBjYXNl IEdkay5LZXkuQzoKKyAgICAgICAgICAgICBjYXNlIEdkay5LZXkuYzoKKyAgICAgICAgICAgICAg ICAgaWYgKChtb2RpZmllcnMgJiBHZGsuTW9kaWZpZXJUeXBlLlNISUZUX01BU0spICE9IDApIHsK K0BAIC0yNTAzLDE5ICsyMzc1LDExIEBAIHB1YmxpYyBjbGFzcyBJQnVzRW1vamllciA6IEd0ay5B cHBsaWNhdGlvbldpbmRvdyB7CisgICAgICAgICAgICAgICAgICAgICAgICAgY2xpcGJvYXJkLnN0 b3JlKCk7CisgICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAg ICAgICAgICAgICB9CistICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAobV9lbnRyeS5nZXRfdGV4 dCgpLmxlbmd0aCA+IDApIHsKKy0gICAgICAgICAgICAgICAgICAgIEdMaWIuU2lnbmFsLmVtaXRf YnlfbmFtZShtX2VudHJ5LCAiY29weS1jbGlwYm9hcmQiKTsKKy0gICAgICAgICAgICAgICAgICAg IHJldHVybiB0cnVlOworICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgIGJyZWFr OworLSAgICAgICAgICAgIGNhc2UgR2RrLktleS52OgorLSAgICAgICAgICAgICAgICBHTGliLlNp Z25hbC5lbWl0X2J5X25hbWUobV9lbnRyeSwgInBhc3RlLWNsaXBib2FyZCIpOworLSAgICAgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgICB9CisgICAgICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgICAgICAgfQorLQorLSAgICAgICAgZW50cnlfZW50ZXJfa2V5dmFsKGtleXZh bCk7CisgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgfQorIAorQEAgLTI1OTUsNyArMjQ1OSw2 IEBAIHB1YmxpYyBjbGFzcyBJQnVzRW1vamllciA6IEd0ay5BcHBsaWNhdGlvbldpbmRvdyB7Cisg CisgICAgICAgICB1aW50MzIgdGltZXN0YW1wID0gZXZlbnQuZ2V0X3RpbWUoKTsKKyAgICAgICAg IHByZXNlbnRfd2l0aF90aW1lKHRpbWVzdGFtcCk7CistICAgICAgICBtX2VudHJ5LnNldF9hY3Rp dmF0ZXNfZGVmYXVsdCh0cnVlKTsKKyAgICAgfQorIAorIAorLS0gCisyLjE3LjEKKworRnJvbSBl NmJhZGI0OTRlMGEzMWI3YWNhM2E1MDc4YTVkYzViMjdiODMzOTBkIE1vbiBTZXAgMTcgMDA6MDA6 MDAgMjAwMQorRnJvbTogZnVqaXdhcmF0IDx0YWthby5mdWppd2FyYTFAZ21haWwuY29tPgorRGF0 ZTogVGh1LCAzMCBBdWcgMjAxOCAxMjo1Nzo0NiArMDkwMAorU3ViamVjdDogW1BBVENIXSB1aS9n dGszOiBTdXBwb3J0IFNoaWZ0LVNwYWNlIHRvIGluc2VydCBhIFNwYWNlIG9uIEVtb2ppZXIKKyBw cmVlZGl0CisKK0ltcGxlbWVudGVkIFNoaWZ0LVNwYWNlIG9uIHByZWVkaXQgc2luY2UgU2hpZnQt U3BhY2UgaGFkIHdvcmtlZCBvbgorRW1vamllcidzIEd0a0VudHJ5IGluIHRoZSBwcmV2aW91cyBy ZWxlYXNlLgorLS0tCisgdWkvZ3RrMy9wYW5lbGJpbmRpbmcudmFsYSB8IDI3ICsrKysrKysrKysr KysrKysrKysrLS0tLS0tLQorIDEgZmlsZSBjaGFuZ2VkLCAyMCBpbnNlcnRpb25zKCspLCA3IGRl bGV0aW9ucygtKQorCitkaWZmIC0tZ2l0IGEvdWkvZ3RrMy9wYW5lbGJpbmRpbmcudmFsYSBiL3Vp L2d0azMvcGFuZWxiaW5kaW5nLnZhbGEKK2luZGV4IDk4MWI1NTA5Li40ZWJmZjhkYSAxMDA2NDQK Ky0tLSBhL3VpL2d0azMvcGFuZWxiaW5kaW5nLnZhbGEKKysrKyBiL3VpL2d0azMvcGFuZWxiaW5k aW5nLnZhbGEKK0BAIC01NDgsNiArNTQ4LDE5IEBAIGNsYXNzIFBhbmVsQmluZGluZyA6IElCdXMu UGFuZWxTZXJ2aWNlIHsKKyAgICAgfQorIAorIAorKyAgICBwcml2YXRlIGJvb2wga2V5X3ByZXNz X2tleXZhbCh1aW50IGtleXZhbCkgeworKyAgICAgICAgdW5pY2hhciBjaCA9IElCdXMua2V5dmFs X3RvX3VuaWNvZGUoa2V5dmFsKTsKKysgICAgICAgIGlmIChjaC5pc2NudHJsKCkpCisrICAgICAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKKysgICAgICAgIHN0cmluZyBzdHIgPSBjaC50b19zdHJp bmcoKTsKKysgICAgICAgIG1fcHJlZWRpdC5hcHBlbmRfdGV4dChzdHIpOworKyAgICAgICAgc3Ry aW5nIGFubm90YXRpb24gPSBtX3ByZWVkaXQuZ2V0X3RleHQoKTsKKysgICAgICAgIG1fZW1vamll ci5zZXRfYW5ub3RhdGlvbihhbm5vdGF0aW9uKTsKKysgICAgICAgIG1fcHJlZWRpdC5zZXRfZW1v amkoIiIpOworKyAgICAgICAgcmV0dXJuIHRydWU7CisrICAgIH0KKysKKysKKyAgICAgcHJpdmF0 ZSBib29sIGtleV9wcmVzc19lbnRlcigpIHsKKyAgICAgICAgIGlmIChtX2V4dGVuc2lvbl9uYW1l ICE9ICJ1bmljb2RlIiAmJiBpc19lbW9qaV9sb29rdXBfdGFibGUoKSkgeworICAgICAgICAgICAg IC8vIENoZWNrIGlmIHZhcmlhdHMgZXhpc3QKK0BAIC04OTksNiArOTEyLDEyIEBAIGNsYXNzIFBh bmVsQmluZGluZyA6IElCdXMuUGFuZWxTZXJ2aWNlIHsKKyAgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgIGNhc2UgR2RrLktleS5zcGFjZToKKyAgICAgICAgIGNhc2UgR2RrLktleS5LUF9TcGFj ZToKKysgICAgICAgICAgICBpZiAoKG1vZGlmaWVycyAmIEdkay5Nb2RpZmllclR5cGUuU0hJRlRf TUFTSykgIT0gMCkgeworKyAgICAgICAgICAgICAgICBpZiAoIWtleV9wcmVzc19rZXl2YWwoa2V5 dmFsKSkKKysgICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworKyAgICAgICAgICAgICAg ICBzaG93X2NhbmRpZGF0ZSA9IGlzX2Vtb2ppX2xvb2t1cF90YWJsZSgpOworKyAgICAgICAgICAg ICAgICBicmVhazsKKysgICAgICAgICAgICB9CisgICAgICAgICAgICAgc2hvd19jYW5kaWRhdGUg PSBrZXlfcHJlc3Nfc3BhY2UoKTsKKyAgICAgICAgICAgICBpZiAobV9leHRlbnNpb25fbmFtZSA9 PSAidW5pY29kZSIpIHsKKyAgICAgICAgICAgICAgICAga2V5X3ByZXNzX2VudGVyKCk7CitAQCAt OTc5LDE0ICs5OTgsOCBAQCBjbGFzcyBQYW5lbEJpbmRpbmcgOiBJQnVzLlBhbmVsU2VydmljZSB7 CisgICAgICAgICAgICAgICAgIHNob3dfY2FuZGlkYXRlID0ga2V5X3ByZXNzX2NvbnRyb2xfa2V5 dmFsKGtleXZhbCwgbW9kaWZpZXJzKTsKKyAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAg ICAgICAgfQorLSAgICAgICAgICAgIHVuaWNoYXIgY2ggPSBJQnVzLmtleXZhbF90b191bmljb2Rl KGtleXZhbCk7CistICAgICAgICAgICAgaWYgKGNoLmlzY250cmwoKSkKKysgICAgICAgICAgICBp ZiAoIWtleV9wcmVzc19rZXl2YWwoa2V5dmFsKSkKKyAgICAgICAgICAgICAgICAgcmV0dXJuIHRy dWU7CistICAgICAgICAgICAgc3RyaW5nIHN0ciA9IGNoLnRvX3N0cmluZygpOworLSAgICAgICAg ICAgIG1fcHJlZWRpdC5hcHBlbmRfdGV4dChzdHIpOworLSAgICAgICAgICAgIHN0cmluZyBhbm5v dGF0aW9uID0gbV9wcmVlZGl0LmdldF90ZXh0KCk7CistICAgICAgICAgICAgbV9lbW9qaWVyLnNl dF9hbm5vdGF0aW9uKGFubm90YXRpb24pOworLSAgICAgICAgICAgIG1fcHJlZWRpdC5zZXRfZW1v amkoIiIpOworICAgICAgICAgICAgIHNob3dfY2FuZGlkYXRlID0gaXNfZW1vamlfbG9va3VwX3Rh YmxlKCk7CisgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICB9CistLSAKKzIuMTcuMQorCitG cm9tIDgwOWQ4ODAzMzdlNzViN2NlZTQyOTI5MmEyMzhiZjUzODk5YmVmNmEgTW9uIFNlcCAxNyAw MDowMDowMCAyMDAxCitGcm9tOiBmdWppd2FyYXQgPHRha2FvLmZ1aml3YXJhMUBnbWFpbC5jb20+ CitEYXRlOiBUaHUsIDMwIEF1ZyAyMDE4IDEyOjU4OjU3ICswOTAwCitTdWJqZWN0OiBbUEFUQ0hd IHVpL2d0azM6IERvIG5vdCBtb3ZlIEVtb2ppZXIgcG9wdXAgd2l0aCB0aGUgYWN0aXZlCisgY2Fu ZGlkYXRlIGluIFhvcmcKKworUHJvYmFibHkgSSB0aGluayBpdCdzIG5vdCB1c2VmdWwgdG8gY2hh bmdlIHRoZSBwb3B1cCBwb3NpdGlvbiBmcmVxdWVudGx5LgorVGhlIHBvcHVwIHNpemUgaXMgYWx3 YXlzIHNsaWdodGx5IGNoYW5nZWQgd2l0aCB0aGUgZW1vamkgYW5ub3RhdGlvbiBsZW5ndGguCist LS0KKyB1aS9ndGszL2Vtb2ppZXIudmFsYSB8IDEwICsrKysrKysrKy0KKyAxIGZpbGUgY2hhbmdl ZCwgOSBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCisKK2RpZmYgLS1naXQgYS91aS9ndGsz L2Vtb2ppZXIudmFsYSBiL3VpL2d0azMvZW1vamllci52YWxhCitpbmRleCAwZjQ1NTgwMC4uOTgx MWZkZTUgMTAwNjQ0CistLS0gYS91aS9ndGszL2Vtb2ppZXIudmFsYQorKysrIGIvdWkvZ3RrMy9l bW9qaWVyLnZhbGEKK0BAIC0xOTQ0LDcgKzE5NDQsMTUgQEAgcHVibGljIGNsYXNzIElCdXNFbW9q aWVyIDogR3RrLkFwcGxpY2F0aW9uV2luZG93IHsKKyAgICAgICAgICAgICB4ID0gMDsKKyAKKyAg ICAgICAgIGJvb2wgY2hhbmdlZCA9IGZhbHNlOworLSAgICAgICAgaWYgKHdpbmRvd19yaWdodF9i b3R0b20ueSA+IG1vbml0b3JfYm90dG9tKSB7CisrICAgICAgICAvLyBEbyBub3QgdXAgc2lkZSBk b3duIGZyZXF1ZW50bHkuCisrICAgICAgICAvLyBUaGUgZmlyc3QgcG9zIGRvZXMgbm90IHNob3cg dGhlIGxvb2t1cCB0YWJsZSB5ZXQgYnV0IHRoZQorKyAgICAgICAgLy8gcHJlZWRpdCBvbmx5IGFu ZCB0aGUgc2Vjb25kIHBvcyBzaG93cyB0aGUgbG9va3VwIHRhYmxlLgorKyAgICAgICAgaWYgKG1f bG9va3VwX3RhYmxlLmdldF9jdXJzb3JfcG9zKCkgIT0gMSkgeworKyAgICAgICAgICAgIGlmICht X2lzX3VwX3NpZGVfZG93bikKKysgICAgICAgICAgICAgICAgeSA9IG1fY3Vyc29yX2xvY2F0aW9u LnkgLSBhbGxvY2F0aW9uLmhlaWdodDsKKysgICAgICAgICAgICBlbHNlCisrICAgICAgICAgICAg ICAgIHkgPSBjdXJzb3JfcmlnaHRfYm90dG9tLnk7CisrICAgICAgICB9IGVsc2UgaWYgKHdpbmRv d19yaWdodF9ib3R0b20ueSA+IG1vbml0b3JfYm90dG9tKSB7CisgICAgICAgICAgICAgeSA9IG1f Y3Vyc29yX2xvY2F0aW9uLnkgLSBhbGxvY2F0aW9uLmhlaWdodDsKKyAgICAgICAgICAgICAvLyBE byBub3QgdXAgc2lkZSBkb3duIGluIFdheWxhbmQKKyAgICAgICAgICAgICBpZiAobV9pbnB1dF9j b250ZXh0X3BhdGggPT0gIiIpIHsKKy0tIAorMi4xNy4xCisKCmRpZmYgLS1naXQgYS9pYnVzLnNw ZWMgYi9pYnVzLnNwZWMKaW5kZXggNDYzMTkxZS4uYzQ2ZjdkMyAxMDA2NDQKLS0tIGEvaWJ1cy5z cGVjCisrKyBiL2lidXMuc3BlYwpAQCAtMzEsNyArMzEsNyBAQAogCiBOYW1lOiAgICAgICAgICAg aWJ1cwogVmVyc2lvbjogICAgICAgIDEuNS4xOQotUmVsZWFzZTogICAgICAgIDIlez9kaXN0fQor UmVsZWFzZTogICAgICAgIDMlez9kaXN0fQogU3VtbWFyeTogICAgICAgIEludGVsbGlnZW50IElu cHV0IEJ1cyBmb3IgTGludXggT1MKIExpY2Vuc2U6ICAgICAgICBMR1BMdjIrCiBHcm91cDogICAg ICAgICAgU3lzdGVtIEVudmlyb25tZW50L0xpYnJhcmllcwpAQCAtNzgsNiArNzgsOCBAQCBCdWls ZFJlcXVpcmVzOiAgcXQ1LXF0YmFzZS1kZXZlbAogQnVpbGRSZXF1aXJlczogIGNsZHItZW1vamkt YW5ub3RhdGlvbgogQnVpbGRSZXF1aXJlczogIHVuaWNvZGUtZW1vamkKIEJ1aWxkUmVxdWlyZXM6 ICB1bmljb2RlLXVjZAorIyBmb3IgaWJ1cy1rZXlwcmVzcworQnVpbGRSZXF1aXJlczogIGxpYlh0 c3QtZGV2ZWwKIAogUmVxdWlyZXM6ICAgICAgICV7bmFtZX0tbGlicyV7P19pc2F9ICAgPSAle3Zl cnNpb259LSV7cmVsZWFzZX0KIFJlcXVpcmVzOiAgICAgICAle25hbWV9LWd0azIlez9faXNhfSAg ID0gJXt2ZXJzaW9ufS0le3JlbGVhc2V9CkBAIC00MjYsNiArNDI4LDExIEBAIGRjb25mIHVwZGF0 ZSB8fCA6CiAle19kYXRhZGlyfS9ndGstZG9jL2h0bWwvKgogCiAlY2hhbmdlbG9nCisqIFRodSBB dWcgMzAgMjAxOCBUYWthbyBGdWppd2FyYSA8dGZ1aml3YXJAcmVkaGF0LmNvbT4gLSAxLjUuMTkt MworLSBGaXggQnVnIDE2MTg2ODIgLSBTRUdWIHdpdGggQVNDSUkgb24gZW1vamllciBpbiBXYXls YW5kCistIFN1cHBvcnQgU2hpZnQtU3BhY2Ugb24gZW1vamllciBwcmVlZGl0CistIERvIG5vdCBt b3ZlIEVtb2ppZXIgcG9wdXAgd2l0aCB0aGUgYWN0aXZlIGNhbmRpZGF0ZSBpbiBYb3JnCisKICog V2VkIEF1ZyAyMiAyMDE4IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPiAtIDEu NS4xOS0yCiAtIERvIG5vdCBjbGVhciBVbmljb2RlIGRhdGEgd2hlbiBlbW9qaSBhbm5vdGF0aW9u IGxhbmcgaXMgY2hhbmdlZAogCg==