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 SEGV Choose an emoji by mouse from the emoji category list Date: Sun, 31 May 2026 02:06:59 GMT Message-ID: <178019321939.1.4149873277001924078.rpms-ibus-ed8c51ca3ac7@fedoraproject.org> List-ID: X-Git-Repo: rpms/ibus X-Git-Branch: autotool X-Git-Rev: ed8c51ca3ac789a3e9a67010f0c8ab3db716f6d4 QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvaWJ1cwpCcmFuY2gg OiBhdXRvdG9vbApDb21taXQgOiBlZDhjNTFjYTNhYzc4OWEzZTlhNjcwMTBmMGM4YWIzZGI3MTZm NmQ0CkF1dGhvciA6IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPgpEYXRlICAg OiAyMDE4LTA5LTE0VDE2OjU5OjQyKzA5OjAwClN0YXRzICA6ICszMjIvLTEgaW4gMiBmaWxlKHMp ClVSTCAgICA6IGh0dHBzOi8vc3JjLmZlZG9yYXByb2plY3Qub3JnL3JwbXMvaWJ1cy9jL2VkOGM1 MWNhM2FjNzg5YTNlOWE2NzAxMGYwYzhhYjNkYjcxNmY2ZDQ/YnJhbmNoPWF1dG90b29sCgpMb2c6 CkZpeCBCdWcgU0VHViBDaG9vc2UgYW4gZW1vamkgYnkgbW91c2UgZnJvbSB0aGUgZW1vamkgY2F0 ZWdvcnkgbGlzdAoKLS0tCmRpZmYgLS1naXQgYS9pYnVzLUhFQUQucGF0Y2ggYi9pYnVzLUhFQUQu cGF0Y2gKaW5kZXggMmJiYWQ0Yi4uMzkyZDMyYSAxMDA2NDQKLS0tIGEvaWJ1cy1IRUFELnBhdGNo CisrKyBiL2lidXMtSEVBRC5wYXRjaApAQCAtMzkyLDMgKzM5MiwzMjEgQEAgaW5kZXggMGY0NTU4 MDAuLjk4MTFmZGU1IDEwMDY0NAogLS0gCiAyLjE3LjEKIAorRnJvbSAxYzY1NjVlMjA1NTI4YTQ1 ZTg4YTg0YmEyYTMyOGY5MDM1ODc1YzhkIE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJvbTog ZnVqaXdhcmF0IDx0YWthby5mdWppd2FyYTFAZ21haWwuY29tPgorRGF0ZTogRnJpLCAxNCBTZXAg MjAxOCAxNjoxNTo0MSArMDkwMAorU3ViamVjdDogW1BBVENIXSB1aS9ndGszOiBGaXggU0VHViB3 aGVuIGNvbW1pdCBhbiBlbW9qaSBvbiBFbW9qaWVyIGluIFdheWxhbmQKKworSnVzdCBwcmVzc2lu ZyBTcGFjZSBrZXkgd2l0aG91dCBlbW9qaSBhbm5vdGF0aW9ucyBjYW4gbGF1bmNoIEVtb2ppZXIK K3BvcHVwIGFuZCB0aGUgcG9wdXAgdGFrZXMgYSBmb2N1cyBpbiBXYXlsYW5kIGFuZCB0aGUgY2hv c2VuIGVtb2ppIGlzCitvdXRwdXQgd2hlbiB0aGUgb3JpZ2luYWwgdGV4dCBhcHBsaWNhdGlvbiBn ZXRzIHRoZSBmb2N1cyBhZnRlciBFbW9qaWVyCitwb3B1cCByZWxlYXNlIHRoZSBmb2N1cy4gRW1v amllciBkaXNhYmxlZCBDdHJsLVNoaWZ0LWUgYWZ0ZXIgZ290IHRoZSBmb2N1cy4KK0J1dCBjdXJy ZW50bHkgR05PTUUgV2F5bGFuZCBoYXMgYSBidWcgbm90IHRvIHNlbmQgZm9jdXMtaW4gdW50aWwg YQora2V5IHByZXNzIG9yIG1vdXNlIGNsaWNrIGhhcHBlbnMgWzFdIGFuZCBFbW9qaWVyIGNhdXNl cyBhIFNFR1YuCitOb3cgRW1vamllciBkaXNhYmxlcyBDdHJsLVNoaWZ0LWUgaW1tZWRpYXRlbHkg d2hlbiBhbiBlbW9qaSBpcyBjaG9zZW4KK3doZXRoZXIgZm9jdXMtaW4gY29tZXMgb3Igbm90IGFu ZCBmaXhlcyB0aGUgU0VHVi4KKworWzFdIGh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9n bm9tZS1zaGVsbC9pc3N1ZXMvNTczCisKK0JVRz1yaGJ6IzE2MjUxODcKKy0tLQorIHVpL2d0azMv ZW1vamllci52YWxhICAgICAgfCA2MyArKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLQorIHVpL2d0azMvZW1vamllcmFwcC52YWxhICAgfCAgMiArLQorIHVpL2d0azMvcGFuZWxi aW5kaW5nLnZhbGEgfCA2NCArKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0K KyAzIGZpbGVzIGNoYW5nZWQsIDU1IGluc2VydGlvbnMoKyksIDc0IGRlbGV0aW9ucygtKQorCitk aWZmIC0tZ2l0IGEvdWkvZ3RrMy9lbW9qaWVyLnZhbGEgYi91aS9ndGszL2Vtb2ppZXIudmFsYQor aW5kZXggOTgxMWZkZTUuLmUyM2VmODg5IDEwMDY0NAorLS0tIGEvdWkvZ3RrMy9lbW9qaWVyLnZh bGEKKysrKyBiL3VpL2d0azMvZW1vamllci52YWxhCitAQCAtMjEsMTcgKzIxLDYgQEAKKyAgKi8K KyAKKyBwdWJsaWMgY2xhc3MgSUJ1c0Vtb2ppZXIgOiBHdGsuQXBwbGljYXRpb25XaW5kb3cgewor LSAgICBwcml2YXRlIGNsYXNzIEVFbnRyeSA6IEd0ay5TZWFyY2hFbnRyeSB7CistICAgICAgICBw dWJsaWMgRUVudHJ5KCkgeworLSAgICAgICAgICAgIEdMaWIuT2JqZWN0KAorLSAgICAgICAgICAg ICAgICBuYW1lIDogIklCdXNFbW9qaWVyRW50cnkiLAorLSAgICAgICAgICAgICAgICBtYXJnaW5f c3RhcnQgOiA2LAorLSAgICAgICAgICAgICAgICBtYXJnaW5fZW5kIDogNiwKKy0gICAgICAgICAg ICAgICAgbWFyZ2luX3RvcCA6IDYsCistICAgICAgICAgICAgICAgIG1hcmdpbl9ib3R0b20gOiA2 CistICAgICAgICAgICAgKTsKKy0gICAgICAgIH0KKy0gICAgfQorICAgICBwcml2YXRlIGNsYXNz IEVMaXN0Qm94IDogR3RrLkxpc3RCb3ggeworICAgICAgICAgcHVibGljIEVMaXN0Qm94KCkgewor ICAgICAgICAgICAgIEdMaWIuT2JqZWN0KAorQEAgLTMzMCw2ICszMTksNyBAQCBwdWJsaWMgY2xh c3MgSUJ1c0Vtb2ppZXIgOiBHdGsuQXBwbGljYXRpb25XaW5kb3cgeworICAgICBwcml2YXRlIHVp bnQgbV9yZWRyYXdfd2luZG93X2lkOworIAorICAgICBwdWJsaWMgc2lnbmFsIHZvaWQgY2FuZGlk YXRlX2NsaWNrZWQodWludCBpbmRleCwgdWludCBidXR0b24sIHVpbnQgc3RhdGUpOworKyAgICBw dWJsaWMgc2lnbmFsIHZvaWQgY29tbWl0X3RleHQoc3RyaW5nIHRleHQpOworIAorICAgICBwdWJs aWMgSUJ1c0Vtb2ppZXIoKSB7CisgICAgICAgICBHTGliLk9iamVjdCgKK0BAIC0zODAsMTIgKzM3 MCw2IEBAIHB1YmxpYyBjbGFzcyBJQnVzRW1vamllciA6IEd0ay5BcHBsaWNhdGlvbldpbmRvdyB7 CisgICAgICAgICAgICAgYWRqdXN0X3dpbmRvd19wb3NpdGlvbigpOworICAgICAgICAgfSk7Cisg CistICAgICAgICBjYW5kaWRhdGVfY2xpY2tlZC5jb25uZWN0KChpLCBiLCBzKSA9PiB7CistICAg ICAgICAgICAgaWYgKG1faW5wdXRfY29udGV4dF9wYXRoICE9ICIiKQorLSAgICAgICAgICAgICAg ICBjYW5kaWRhdGVfcGFuZWxfc2VsZWN0X2luZGV4KGksIGIpOworLSAgICAgICAgfSk7CistCist CisgICAgICAgICBpZiAobV9hbm5vdGF0aW9uX3RvX2Vtb2ppc19kaWN0ID09IG51bGwpIHsKKyAg ICAgICAgICAgICByZWxvYWRfZW1vamlfZGljdCgpOworICAgICAgICAgfQorQEAgLTE2NDEsMzQg KzE2MjUsNiBAQCBwdWJsaWMgY2xhc3MgSUJ1c0Vtb2ppZXIgOiBHdGsuQXBwbGljYXRpb25XaW5k b3cgeworICAgICB9CisgCisgCistICAgIHByaXZhdGUgdm9pZCBjYW5kaWRhdGVfcGFuZWxfc2Vs ZWN0X2luZGV4KHVpbnQgaW5kZXgsCistICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHVpbnQgYnV0dG9uKSB7CistICAgICAgICBpZiAoYnV0dG9uID09IEJVVFRP Tl9DTE9TRV9CVVRUT04pIHsKKy0gICAgICAgICAgICBoaWRlKCk7CistICAgICAgICAgICAgaWYg KG1fY2FuZGlkYXRlX3BhbmVsX21vZGUgJiYKKy0gICAgICAgICAgICAgICAgbV9sb29rdXBfdGFi bGUuZ2V0X251bWJlcl9vZl9jYW5kaWRhdGVzKCkgPiAwKSB7CistICAgICAgICAgICAgICAgIC8v IENhbGwgcmVtb3ZlX2FsbF9jaGlsZHJlbigpIGluc3RlYWQgb2Ygc2hvd19jYXRlZ29yeV9saXN0 KCkKKy0gICAgICAgICAgICAgICAgLy8gc28gdGhhdCBzaG93X2NhdGVnb3J5X2xpc3QgZG8gbm90 IHJlbW92ZSBjaGlsZHJlbiB3aXRoCistICAgICAgICAgICAgICAgIC8vIFBhZ2VVcC9QYWdlRG93 bi4KKy0gICAgICAgICAgICAgICAgcmVtb3ZlX2FsbF9jaGlsZHJlbigpOworLSAgICAgICAgICAg IH0KKy0gICAgICAgICAgICBtX3Jlc3VsdCA9ICIiOworLSAgICAgICAgICAgIHJldHVybjsKKy0g ICAgICAgIH0KKy0gICAgICAgIHN0cmluZyB0ZXh0ID0gbV9sb29rdXBfdGFibGUuZ2V0X2NhbmRp ZGF0ZShpbmRleCkudGV4dDsKKy0gICAgICAgIHVub3duZWQgR0xpYi5TTGlzdDxzdHJpbmc+PyBl bW9qaXMgPQorLSAgICAgICAgICAgICAgICBtX2Vtb2ppX3RvX2Vtb2ppX3ZhcmlhbnRzX2RpY3Qu bG9va3VwKHRleHQpOworLSAgICAgICAgaWYgKG1fc2hvd19lbW9qaV92YXJpYW50ICYmIGVtb2pp cyAhPSBudWxsICYmCistICAgICAgICAgICAgbV9iYWNrd2FyZF9pbmRleCA8IDApIHsKKy0gICAg ICAgICAgICBzaG93X2Vtb2ppX3ZhcmlhbnRzKGVtb2ppcyk7CistICAgICAgICAgICAgc2hvd19h bGwoKTsKKy0gICAgICAgIH0gZWxzZSB7CistICAgICAgICAgICAgbV9yZXN1bHQgPSB0ZXh0Owor LSAgICAgICAgICAgIGhpZGUoKTsKKy0gICAgICAgIH0KKy0gICAgfQorLQorLQorICAgICBwcml2 YXRlIHZvaWQgY2FuZGlkYXRlX3BhbmVsX2N1cnNvcl9kb3duKCkgeworICAgICAgICAgZW50ZXJf bm90aWZ5X2Rpc2FibGVfd2l0aF90aW1lcigpOworICAgICAgICAgdWludCBuY2FuZGlkYXRlcyA9 IG1fbG9va3VwX3RhYmxlLmdldF9udW1iZXJfb2ZfY2FuZGlkYXRlcygpOworQEAgLTE3NjIsNyAr MTcxOCw4IEBAIHB1YmxpYyBjbGFzcyBJQnVzRW1vamllciA6IEd0ay5BcHBsaWNhdGlvbldpbmRv dyB7CisgICAgIH0KKyAKKyAKKy0gICAgcHVibGljIGJvb2wgaGFzX3ZhcmlhbnRzKHVpbnQgaW5k ZXgpIHsKKysgICAgcHVibGljIGJvb2wgaGFzX3ZhcmlhbnRzKHVpbnQgaW5kZXgsCisrICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBib29sIG5lZWRfY29tbWl0X3NpZ25hbCkgeworICAgICAg ICAgaWYgKGluZGV4ID49IG1fbG9va3VwX3RhYmxlLmdldF9udW1iZXJfb2ZfY2FuZGlkYXRlcygp KQorICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgIHN0cmluZyB0ZXh0ID0gbV9s b29rdXBfdGFibGUuZ2V0X2NhbmRpZGF0ZShpbmRleCkudGV4dDsKK0BAIC0xNzczLDYgKzE3MzAs MTAgQEAgcHVibGljIGNsYXNzIElCdXNFbW9qaWVyIDogR3RrLkFwcGxpY2F0aW9uV2luZG93IHsK KyAgICAgICAgICAgICBzaG93X2Vtb2ppX3ZhcmlhbnRzKGVtb2ppcyk7CisgICAgICAgICAgICAg cmV0dXJuIHRydWU7CisgICAgICAgICB9CisrICAgICAgICBpZiAobV9pbnB1dF9jb250ZXh0X3Bh dGggIT0gIiIpCisrICAgICAgICAgICAgbV9yZXN1bHQgPSB0ZXh0OworKyAgICAgICAgaWYgKG5l ZWRfY29tbWl0X3NpZ25hbCkKKysgICAgICAgICAgICBjb21taXRfdGV4dCh0ZXh0KTsKKyAgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICAgfQorIAorQEAgLTE4ODEsMTAgKzE4NDIsMTAgQEAgcHVi bGljIGNsYXNzIElCdXNFbW9qaWVyIDogR3RrLkFwcGxpY2F0aW9uV2luZG93IHsKKyAgICAgfQor IAorIAorLSAgICBwdWJsaWMgYm9vbCBrZXlfcHJlc3NfZW50ZXIoKSB7CisrICAgIHB1YmxpYyBi b29sIGtleV9wcmVzc19lbnRlcihib29sIG5lZWRfY29tbWl0X3NpZ25hbCkgeworICAgICAgICAg aWYgKG1fY2FuZGlkYXRlX3BhbmVsX2lzX3Zpc2libGUpIHsKKyAgICAgICAgICAgICB1aW50IGlu ZGV4ID0gbV9sb29rdXBfdGFibGUuZ2V0X2N1cnNvcl9wb3MoKTsKKy0gICAgICAgICAgICByZXR1 cm4gaGFzX3ZhcmlhbnRzKGluZGV4KTsKKysgICAgICAgICAgICByZXR1cm4gaGFzX3ZhcmlhbnRz KGluZGV4LCBuZWVkX2NvbW1pdF9zaWduYWwpOworICAgICAgICAgfSBlbHNlIGlmIChtX2NhdGVn b3J5X2FjdGl2ZV9pbmRleCA+PSAwKSB7CisgICAgICAgICAgICAgR3RrLkxpc3RCb3hSb3cgZ3Rr cm93ID0gbV9saXN0X2JveC5nZXRfc2VsZWN0ZWRfcm93KCk7CisgICAgICAgICAgICAgRUJveFJv dyByb3cgPSBndGtyb3cgYXMgRUJveFJvdzsKK0BAIC0yMjgyLDEyICsyMjQzLDEwIEBAIHB1Ymxp YyBjbGFzcyBJQnVzRW1vamllciA6IEd0ay5BcHBsaWNhdGlvbldpbmRvdyB7CisgICAgICAgICAg ICAgcmV0dXJuIHRydWU7CisgICAgICAgICBjYXNlIEdkay5LZXkuUmV0dXJuOgorICAgICAgICAg Y2FzZSBHZGsuS2V5LktQX0VudGVyOgorLSAgICAgICAgICAgIGlmIChrZXlfcHJlc3NfZW50ZXIo KSkgeworKyAgICAgICAgICAgIGlmIChrZXlfcHJlc3NfZW50ZXIodHJ1ZSkpCisgICAgICAgICAg ICAgICAgIHNob3dfYWxsKCk7CistICAgICAgICAgICAgfSBlbHNlIHsKKy0gICAgICAgICAgICAg ICAgbV9yZXN1bHQgPSBnZXRfY3VycmVudF9jYW5kaWRhdGUoKTsKKysgICAgICAgICAgICBlbHNl CisgICAgICAgICAgICAgICAgIGhpZGUoKTsKKy0gICAgICAgICAgICB9CisgICAgICAgICAgICAg cmV0dXJuIHRydWU7CisgICAgICAgICBjYXNlIEdkay5LZXkuc3BhY2U6CisgICAgICAgICBjYXNl IEdkay5LZXkuS1BfU3BhY2U6CitkaWZmIC0tZ2l0IGEvdWkvZ3RrMy9lbW9qaWVyYXBwLnZhbGEg Yi91aS9ndGszL2Vtb2ppZXJhcHAudmFsYQoraW5kZXggNzg3ZDQ0OGYuLmZhYjk5ZDllIDEwMDY0 NAorLS0tIGEvdWkvZ3RrMy9lbW9qaWVyYXBwLnZhbGEKKysrKyBiL3VpL2d0azMvZW1vamllcmFw cC52YWxhCitAQCAtNjUsNyArNjUsNyBAQCBwdWJsaWMgY2xhc3MgRW1vamlBcHBsaWNhdGlvbiA6 IEd0ay5BcHBsaWNhdGlvbiB7CisgICAgICAgICB1aW50IG5jYW5kaWRhdGVzID0gbV9lbW9qaWVy LmdldF9udW1iZXJfb2ZfY2FuZGlkYXRlcygpOworICAgICAgICAgaWYgKG5jYW5kaWRhdGVzID4g MCAmJiBuY2FuZGlkYXRlcyA+PSBpbmRleCkgeworICAgICAgICAgICAgIG1fZW1vamllci5zZXRf Y3Vyc29yX3BvcyhpbmRleCk7CistICAgICAgICAgICAgc2hvd19jYW5kaWRhdGUgPSBtX2Vtb2pp ZXIuaGFzX3ZhcmlhbnRzKGluZGV4KTsKKysgICAgICAgICAgICBzaG93X2NhbmRpZGF0ZSA9IG1f ZW1vamllci5oYXNfdmFyaWFudHMoaW5kZXgsIGZhbHNlKTsKKyAgICAgICAgIH0gZWxzZSB7Cisg ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgfQorZGlmZiAtLWdpdCBhL3VpL2d0azMvcGFu ZWxiaW5kaW5nLnZhbGEgYi91aS9ndGszL3BhbmVsYmluZGluZy52YWxhCitpbmRleCA0ZWJmZjhk YS4uMDFjNDNiMGQgMTAwNjQ0CistLS0gYS91aS9ndGszL3BhbmVsYmluZGluZy52YWxhCisrKysg Yi91aS9ndGszL3BhbmVsYmluZGluZy52YWxhCitAQCAtNDQ3LDEzICs0NDcsMTkgQEAgY2xhc3Mg UGFuZWxCaW5kaW5nIDogSUJ1cy5QYW5lbFNlcnZpY2UgeworICAgICB9CisgCisgCistICAgIHBy aXZhdGUgdm9pZCBjb21taXRfdGV4dF91cGRhdGVfZmF2b3JpdGVzKElCdXMuVGV4dCB0ZXh0KSB7 CisrICAgIHByaXZhdGUgdm9pZCBjb21taXRfdGV4dF91cGRhdGVfZmF2b3JpdGVzKElCdXMuVGV4 dCB0ZXh0LAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBi b29sICAgICAgZGlzYWJsZV9leHRlbnNpb24pIHsKKyAgICAgICAgIGNvbW1pdF90ZXh0KHRleHQp OworLSAgICAgICAgSUJ1cy5FeHRlbnNpb25FdmVudCBldmVudCA9IG5ldyBJQnVzLkV4dGVuc2lv bkV2ZW50KAorKworKyAgICAgICAgLy8gSWYgZGlzYWJsZV9leHRlbnNpb24gaXMgZmFsc2UsIHRo ZSBleHRlbnNpb24gZXZlbnQgaXMgYWxyZWFkeQorKyAgICAgICAgLy8gc2VudCBiZWZvcmUgdGhl IGZvY3VzLWluIGlzIHJlY2VpdmVkLgorKyAgICAgICAgaWYgKGRpc2FibGVfZXh0ZW5zaW9uKSB7 CisrICAgICAgICAgICAgSUJ1cy5FeHRlbnNpb25FdmVudCBldmVudCA9IG5ldyBJQnVzLkV4dGVu c2lvbkV2ZW50KAorICAgICAgICAgICAgICAgICAgICAgIm5hbWUiLCBtX2V4dGVuc2lvbl9uYW1l LAorICAgICAgICAgICAgICAgICAgICAgImlzLWVuYWJsZWQiLCBmYWxzZSwKKyAgICAgICAgICAg ICAgICAgICAgICJpcy1leHRlbnNpb24iLCB0cnVlKTsKKy0gICAgICAgIHBhbmVsX2V4dGVuc2lv bihldmVudCk7CisrICAgICAgICAgICAgcGFuZWxfZXh0ZW5zaW9uKGV2ZW50KTsKKysgICAgICAg IH0KKyAgICAgICAgIHN0cmluZyBjb21taXR0ZWRfc3RyaW5nID0gdGV4dC50ZXh0OworICAgICAg ICAgc3RyaW5nIHByZWVkaXRfc3RyaW5nID0gbV9wcmVlZGl0LmdldF90ZXh0KCk7CisgICAgICAg ICBtX3ByZWVkaXQuaGlkZSgpOworQEAgLTQ4Miw3ICs0ODgsNyBAQCBjbGFzcyBQYW5lbEJpbmRp bmcgOiBJQnVzLlBhbmVsU2VydmljZSB7CisgICAgICAgICAgICAgcHJldl9jb250ZXh0X3BhdGgg IT0gIiIgJiYKKyAgICAgICAgICAgICBwcmV2X2NvbnRleHRfcGF0aCA9PSBtX2N1cnJlbnRfY29u dGV4dF9wYXRoKSB7CisgICAgICAgICAgICAgSUJ1cy5UZXh0IHRleHQgPSBuZXcgSUJ1cy5UZXh0 LmZyb21fc3RyaW5nKHNlbGVjdGVkX3N0cmluZyk7CistICAgICAgICAgICAgY29tbWl0X3RleHRf dXBkYXRlX2Zhdm9yaXRlcyh0ZXh0KTsKKysgICAgICAgICAgICBjb21taXRfdGV4dF91cGRhdGVf ZmF2b3JpdGVzKHRleHQsIGZhbHNlKTsKKyAgICAgICAgICAgICBtX2Vtb2ppZXIucmVzZXQoKTsK KyAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgIH0KK0BAIC01NjQsMTMgKzU3MCwx MyBAQCBjbGFzcyBQYW5lbEJpbmRpbmcgOiBJQnVzLlBhbmVsU2VydmljZSB7CisgICAgIHByaXZh dGUgYm9vbCBrZXlfcHJlc3NfZW50ZXIoKSB7CisgICAgICAgICBpZiAobV9leHRlbnNpb25fbmFt ZSAhPSAidW5pY29kZSIgJiYgaXNfZW1vamlfbG9va3VwX3RhYmxlKCkpIHsKKyAgICAgICAgICAg ICAvLyBDaGVjayBpZiB2YXJpYXRzIGV4aXN0CistICAgICAgICAgICAgaWYgKG1fZW1vamllci5r ZXlfcHJlc3NfZW50ZXIoKSkgeworKyAgICAgICAgICAgIGlmIChtX2Vtb2ppZXIua2V5X3ByZXNz X2VudGVyKGZhbHNlKSkgeworICAgICAgICAgICAgICAgICBjb252ZXJ0X3ByZWVkaXRfdGV4dCgp OworICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgICB9CisgICAgICAg ICB9CisgICAgICAgICBJQnVzLlRleHQgdGV4dCA9IG1fcHJlZWRpdC5nZXRfY29tbWl0X3RleHQo KTsKKy0gICAgICAgIGNvbW1pdF90ZXh0X3VwZGF0ZV9mYXZvcml0ZXModGV4dCk7CisrICAgICAg ICBjb21taXRfdGV4dF91cGRhdGVfZmF2b3JpdGVzKHRleHQsIHRydWUpOworICAgICAgICAgcmV0 dXJuIGZhbHNlOworICAgICB9CisgCitAQCAtNzEyLDE1ICs3MTgsMTAgQEAgY2xhc3MgUGFuZWxC aW5kaW5nIDogSUJ1cy5QYW5lbFNlcnZpY2UgeworICAgICB9CisgCisgCistICAgIHByaXZhdGUg Ym9vbCBpc192aXNpYmxlX3dheWxhbmRfbG9va3VwX3RhYmxlKCkgeworLSAgICAgICAgcmV0dXJu IG1fd2F5bGFuZF9sb29rdXBfdGFibGVfaXNfdmlzaWJsZTsKKy0gICAgfQorLQorLQorICAgICBw cml2YXRlIHZvaWQgaGlkZV9lbW9qaV9sb29rdXBfdGFibGUoKSB7CisgICAgICAgICBpZiAobV9l bW9qaWVyID09IG51bGwpCisgICAgICAgICAgICAgcmV0dXJuOworLSAgICAgICAgaWYgKG1faXNf d2F5bGFuZCkKKysgICAgICAgIGlmIChtX3dheWxhbmRfbG9va3VwX3RhYmxlX2lzX3Zpc2libGUp CisgICAgICAgICAgICAgaGlkZV93YXlsYW5kX2xvb2t1cF90YWJsZSgpOworICAgICAgICAgZWxz ZQorICAgICAgICAgICAgIG1fZW1vamllci5oaWRlKCk7CitAQCAtNzQ3LDcgKzc0OCw3IEBAIGNs YXNzIFBhbmVsQmluZGluZyA6IElCdXMuUGFuZWxTZXJ2aWNlIHsKKyAKKyAgICAgcHJpdmF0ZSBi b29sIGlzX2Vtb2ppX2xvb2t1cF90YWJsZSgpIHsKKyAgICAgICAgIGlmIChtX2lzX3dheWxhbmQp CistICAgICAgICAgICAgcmV0dXJuIGlzX3Zpc2libGVfd2F5bGFuZF9sb29rdXBfdGFibGUoKTsK KysgICAgICAgICAgICByZXR1cm4gbV93YXlsYW5kX2xvb2t1cF90YWJsZV9pc192aXNpYmxlOwor ICAgICAgICAgZWxzZQorICAgICAgICAgICAgIHJldHVybiBtX2Vtb2ppZXIuZ2V0X3Zpc2libGUo KTsKKyAgICAgfQorQEAgLTc4OCw3ICs3ODksOCBAQCBjbGFzcyBQYW5lbEJpbmRpbmcgOiBJQnVz LlBhbmVsU2VydmljZSB7CisgICAgICAgICAgKi8KKyAgICAgICAgIGlmICghaW5wdXRfY29udGV4 dF9wYXRoLmhhc19zdWZmaXgoIklucHV0Q29udGV4dF8xIikpIHsKKyAgICAgICAgICAgICBtX3Jl YWxfY3VycmVudF9jb250ZXh0X3BhdGggPSBtX2N1cnJlbnRfY29udGV4dF9wYXRoOworLSAgICAg ICAgICAgIHRoaXMuZW1vamllcl9mb2N1c19jb21taXQoKTsKKysgICAgICAgICAgICBpZiAobV9p c193YXlsYW5kKQorKyAgICAgICAgICAgICAgICB0aGlzLmVtb2ppZXJfZm9jdXNfY29tbWl0KCk7 CisgICAgICAgICB9CisgICAgIH0KKyAKK0BAIC04MjIsOCArODI0LDE4IEBAIGNsYXNzIFBhbmVs QmluZGluZyA6IElCdXMuUGFuZWxTZXJ2aWNlIHsKKyAgICAgICAgICAgICAvLyBGb3IgdGl0bGUg aGFuZGxpbmcgaW4gZ25vbWUtc2hlbGwKKyAgICAgICAgICAgICBtX2FwcGxpY2F0aW9uLmFkZF93 aW5kb3cobV9lbW9qaWVyKTsKKyAgICAgICAgICAgICBtX2Vtb2ppZXIuY2FuZGlkYXRlX2NsaWNr ZWQuY29ubmVjdCgoaSwgYiwgcykgPT4geworKyAgICAgICAgICAgICAgICBjYW5kaWRhdGVfY2xp Y2tlZF9sb29rdXBfdGFibGVfcmVhbChpLCBiLCBzLCB0cnVlKTsKKysgICAgICAgICAgICB9KTsK KysgICAgICAgICAgICBtX2Vtb2ppZXIuY29tbWl0X3RleHQuY29ubmVjdCgocykgPT4geworICAg ICAgICAgICAgICAgICBpZiAoIW1faXNfd2F5bGFuZCkKKy0gICAgICAgICAgICAgICAgICAgIGNh bmRpZGF0ZV9jbGlja2VkX2xvb2t1cF90YWJsZShpLCBiLCBzKTsKKysgICAgICAgICAgICAgICAg ICAgIHJldHVybjsKKysgICAgICAgICAgICAgICAgLy8gQ3VycmVudGx5IGVtb2ppZXIgaGFzIGEg Zm9jdXMgYnV0IHRoZSB0ZXh0IGlucHV0IGZvY3VzCisrICAgICAgICAgICAgICAgIC8vIGRvZXMg bm90IGFuZCBjb21taXQgdGhlIHRleHQgbGF0ZXIuCisrICAgICAgICAgICAgICAgIElCdXMuRXh0 ZW5zaW9uRXZlbnQgY2xvc2VfZXZlbnQgPSBuZXcgSUJ1cy5FeHRlbnNpb25FdmVudCgKKysgICAg ICAgICAgICAgICAgICAgICAgICAibmFtZSIsIG1fZXh0ZW5zaW9uX25hbWUsCisrICAgICAgICAg ICAgICAgICAgICAgICAgImlzLWVuYWJsZWQiLCBmYWxzZSwKKysgICAgICAgICAgICAgICAgICAg ICAgICAiaXMtZXh0ZW5zaW9uIiwgdHJ1ZSk7CisrICAgICAgICAgICAgICAgIHBhbmVsX2V4dGVu c2lvbihjbG9zZV9ldmVudCk7CisgICAgICAgICAgICAgfSk7CisgICAgICAgICB9CisgICAgICAg ICBtX2Vtb2ppZXIucmVzZXQoKTsKK0BAIC0xMDQxLDkgKzEwNTMsMTAgQEAgY2xhc3MgUGFuZWxC aW5kaW5nIDogSUJ1cy5QYW5lbFNlcnZpY2UgeworICAgICAgICAgc2hvd19wcmVlZGl0X2FuZF9j YW5kaWRhdGUoc2hvd19jYW5kaWRhdGUpOworICAgICB9CisgCistICAgIHB1YmxpYyBvdmVycmlk ZSB2b2lkIGNhbmRpZGF0ZV9jbGlja2VkX2xvb2t1cF90YWJsZSh1aW50IGluZGV4LAorLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdWludCBi dXR0b24sCistICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB1aW50IHN0YXRlKSB7CisrICAgIHByaXZhdGUgdm9pZCBjYW5kaWRhdGVfY2xpY2tl ZF9sb29rdXBfdGFibGVfcmVhbCh1aW50IGluZGV4LAorKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdWludCBidXR0b24sCisrICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50IHN0YXRlLAorKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBp c19lbW9qaWVyKSB7CisgICAgICAgICBpZiAoYnV0dG9uID09IElCdXNFbW9qaWVyLkJVVFRPTl9D TE9TRV9CVVRUT04pIHsKKyAgICAgICAgICAgICBtX2VuYWJsZV9leHRlbnNpb24gPSBmYWxzZTsK KyAgICAgICAgICAgICBoaWRlX2Vtb2ppX2xvb2t1cF90YWJsZSgpOworQEAgLTEwNjEsMTcgKzEw NzQsMjYgQEAgY2xhc3MgUGFuZWxCaW5kaW5nIDogSUJ1cy5QYW5lbFNlcnZpY2UgeworICAgICAg ICAgdWludCBuY2FuZGlkYXRlcyA9IG1fZW1vamllci5nZXRfbnVtYmVyX29mX2NhbmRpZGF0ZXMo KTsKKyAgICAgICAgIGlmIChuY2FuZGlkYXRlcyA+IDAgJiYgbmNhbmRpZGF0ZXMgPj0gaW5kZXgp IHsKKyAgICAgICAgICAgICBtX2Vtb2ppZXIuc2V0X2N1cnNvcl9wb3MoaW5kZXgpOworLSAgICAg ICAgICAgIHNob3dfY2FuZGlkYXRlID0gbV9lbW9qaWVyLmhhc192YXJpYW50cyhpbmRleCk7Cist ICAgICAgICAgICAgbV9wcmVlZGl0LnNldF9lbW9qaShtX2Vtb2ppZXIuZ2V0X2N1cnJlbnRfY2Fu ZGlkYXRlKCkpOworKyAgICAgICAgICAgIGJvb2wgbmVlZF9jb21taXRfc2lnbmFsID0gbV9pc193 YXlsYW5kICYmIGlzX2Vtb2ppZXI7CisrICAgICAgICAgICAgc2hvd19jYW5kaWRhdGUgPSBtX2Vt b2ppZXIuaGFzX3ZhcmlhbnRzKGluZGV4LCBuZWVkX2NvbW1pdF9zaWduYWwpOworKyAgICAgICAg ICAgIGlmICghbV9pc193YXlsYW5kKQorKyAgICAgICAgICAgICAgICBtX3ByZWVkaXQuc2V0X2Vt b2ppKG1fZW1vamllci5nZXRfY3VycmVudF9jYW5kaWRhdGUoKSk7CisgICAgICAgICB9IGVsc2Ug eworICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgIH0KKyAgICAgICAgIGlmICghc2hvd19j YW5kaWRhdGUpIHsKKyAgICAgICAgICAgICBJQnVzLlRleHQgdGV4dCA9IG1fcHJlZWRpdC5nZXRf Y29tbWl0X3RleHQoKTsKKy0gICAgICAgICAgICBjb21taXRfdGV4dF91cGRhdGVfZmF2b3JpdGVz KHRleHQpOworICAgICAgICAgICAgIGhpZGVfZW1vamlfbG9va3VwX3RhYmxlKCk7CisrICAgICAg ICAgICAgaWYgKCFpc19lbW9qaWVyIHx8ICFtX2lzX3dheWxhbmQpCisrICAgICAgICAgICAgICAg IGNvbW1pdF90ZXh0X3VwZGF0ZV9mYXZvcml0ZXModGV4dCwgdHJ1ZSk7CisgICAgICAgICAgICAg cmV0dXJuOworICAgICAgICAgfQorICAgICAgICAgc2hvd19wcmVlZGl0X2FuZF9jYW5kaWRhdGUo c2hvd19jYW5kaWRhdGUpOworICAgICB9CisrCisrICAgIHB1YmxpYyBvdmVycmlkZSB2b2lkIGNh bmRpZGF0ZV9jbGlja2VkX2xvb2t1cF90YWJsZSh1aW50IGluZGV4LAorKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdWludCBidXR0b24sCisr ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1 aW50IHN0YXRlKSB7CisrICAgICAgICBjYW5kaWRhdGVfY2xpY2tlZF9sb29rdXBfdGFibGVfcmVh bChpbmRleCwgYnV0dG9uLCBzdGF0ZSwgZmFsc2UpOworKyAgICB9CisgfQorLS0gCisyLjE3LjEK KwoKZGlmZiAtLWdpdCBhL2lidXMuc3BlYyBiL2lidXMuc3BlYwppbmRleCBjNDZmN2QzLi4yNmY1 YjA0IDEwMDY0NAotLS0gYS9pYnVzLnNwZWMKKysrIGIvaWJ1cy5zcGVjCkBAIC0zMSw3ICszMSw3 IEBACiAKIE5hbWU6ICAgICAgICAgICBpYnVzCiBWZXJzaW9uOiAgICAgICAgMS41LjE5Ci1SZWxl YXNlOiAgICAgICAgMyV7P2Rpc3R9CitSZWxlYXNlOiAgICAgICAgNCV7P2Rpc3R9CiBTdW1tYXJ5 OiAgICAgICAgSW50ZWxsaWdlbnQgSW5wdXQgQnVzIGZvciBMaW51eCBPUwogTGljZW5zZTogICAg ICAgIExHUEx2MisKIEdyb3VwOiAgICAgICAgICBTeXN0ZW0gRW52aXJvbm1lbnQvTGlicmFyaWVz CkBAIC00MjgsNiArNDI4LDkgQEAgZGNvbmYgdXBkYXRlIHx8IDoKICV7X2RhdGFkaXJ9L2d0ay1k b2MvaHRtbC8qCiAKICVjaGFuZ2Vsb2cKKyogRnJpIFNlcCAxNCAyMDE4IFRha2FvIEZ1aml3YXJh IDx0ZnVqaXdhckByZWRoYXQuY29tPiAtIDEuNS4xOS00CistIEZpeCBCdWcgU0VHViBDaG9vc2Ug YW4gZW1vamkgYnkgbW91c2UgZnJvbSB0aGUgZW1vamkgY2F0ZWdvcnkgbGlzdAorCiAqIFRodSBB dWcgMzAgMjAxOCBUYWthbyBGdWppd2FyYSA8dGZ1aml3YXJAcmVkaGF0LmNvbT4gLSAxLjUuMTkt MwogLSBGaXggQnVnIDE2MTg2ODIgLSBTRUdWIHdpdGggQVNDSUkgb24gZW1vamllciBpbiBXYXls YW5kCiAtIFN1cHBvcnQgU2hpZnQtU3BhY2Ugb24gZW1vamllciBwcmVlZGl0Cg==