com gtk/php-gtk: utf8 conversion for user input in existing gtk.overrides: ext/gtk+/gtk.overrides
[email protected] (David Soria Parra) Wed, 14 Sep 2005 15:30:21 +0000
| Newsgroups | php.gtk.cvs |
|---|---|
| Message-ID | <[email protected]> |
--b83ffb269927d7db794c02f7364292d88df4169f Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Commit: aba816d81f9c11ef520fdccc12cc7859cdfe3b48=0AAuthor: Steph Fox = <[email protected]> Wed, 14 Sep 2005 15:30:21 +0000=0AParents: 4848626= 6cd5872889a057d4e47116c172226a54b=0ABranches: master=0A=0ALink: http= ://git.php.net/?p=3Dgtk/php-gtk.git;a=3Dcommitdiff;h=3Daba816d81f9c11ef520f= dccc12cc7859cdfe3b48=0A=0ALog:=0Autf8 conversion for user input in existing= gtk.overrides=0A=0AChanged paths:=0A M ext/gtk+/gtk.overrides=0A=0A --b83ffb269927d7db794c02f7364292d88df4169f Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="diff_aba816d81f9c11ef520fdccc12cc7859cdfe3b48.txt" YWJhODE2ZDgxZjljMTFlZjUyMGZkY2NjMTJjYzc4NTljZGZlM2I0OApkaWZmIC0tZ2l0IGEvZXh0 L2d0aysvZ3RrLm92ZXJyaWRlcyBiL2V4dC9ndGsrL2d0ay5vdmVycmlkZXMKaW5kZXggZGI1ZGYy Ny4uYWY4OTc3OCAxMDA2NDQKLS0tIGEvZXh0L2d0aysvZ3RrLm92ZXJyaWRlcworKysgYi9leHQv Z3RrKy9ndGsub3ZlcnJpZGVzCkBAIC00NjAsOSArNDYwLDkgQEAgUEhQX01FVEhPRAogewogICAg IEdPYmplY3QgKndyYXBwZWRfb2JqOwogICAgIGdjaGFyICp0ZXh0ID0gTlVMTDsKLSAgICB6ZW5k X2Jvb2wgdXNlX3VuZGVybGluZSA9IDE7CisgICAgemVuZF9ib29sIGZyZWVfdGV4dCwgdXNlX3Vu ZGVybGluZSA9IDE7CiAKLSAgICBpZiAoIXBocF9ndGtfcGFyc2VfYXJncyhaRU5EX05VTV9BUkdT KCksICJ8c2IiLCAmdGV4dCwgJnVzZV91bmRlcmxpbmUpKSB7CisgICAgaWYgKCFwaHBfZ3RrX3Bh cnNlX2FyZ3MoWkVORF9OVU1fQVJHUygpLCAifHViIiwgJnRleHQsICZmcmVlX3RleHQsICZ1c2Vf dW5kZXJsaW5lKSkgewogICAgICAgICBQSFBHX1RIUk9XX0NPTlNUUlVDVF9FWENFUFRJT04oR3Rr QnV0dG9uKTsKICAgICB9CiAKQEAgLTQ3Myw2ICs0NzMsOCBAQCBQSFBfTUVUSE9ECiAgICAgICAg IHdyYXBwZWRfb2JqID0gKEdPYmplY3QgKilnX29iamVjdF9uZXcocGhwZ19ndHlwZV9mcm9tX3p2 YWwodGhpc19wdHIpLCBOVUxMKTsKICAgICB9CiAKKyAgICBpZiAoZnJlZV90ZXh0KSBnX2ZyZWUo dGV4dCk7CisKICAgICBpZiAoIXdyYXBwZWRfb2JqKSB7CiAgICAgICAgIFBIUEdfVEhST1dfQ09O U1RSVUNUX0VYQ0VQVElPTihHdGtCdXR0b24pOwogICAgIH0KQEAgLTQ5MywxNCArNDk1LDE3IEBA IFBIUF9NRVRIT0QKIHsKICAgICBHT2JqZWN0ICp3cmFwcGVkX29iajsKICAgICBnY2hhciAqc3Rv Y2tfaWQgPSBOVUxMOworICAgIHplbmRfYm9vbCBmcmVlX3N0b2NrX2lkOwogCi0gICAgaWYgKCFw aHBfZ3RrX3BhcnNlX2FyZ3MoWkVORF9OVU1fQVJHUygpLCAicyIsICZzdG9ja19pZCkpIHsKKyAg ICBpZiAoIXBocF9ndGtfcGFyc2VfYXJncyhaRU5EX05VTV9BUkdTKCksICJ1IiwgJnN0b2NrX2lk LCAmZnJlZV9zdG9ja19pZCkpIHsKICAgICAgICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBU SU9OKEd0a0J1dHRvbik7CiAgICAgfQogCiAgICAgd3JhcHBlZF9vYmogPSAoR09iamVjdCAqKWdf b2JqZWN0X25ldyhwaHBnX2d0eXBlX2Zyb21fY2xhc3MoRUcoc2NvcGUpKSwgImxhYmVsIiwgc3Rv Y2tfaWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAidXNlLXN0 b2NrIiwgVFJVRSwgInVzZS11bmRlcmxpbmUiLCBUUlVFLCBOVUxMKTsKIAorICAgIGlmIChmcmVl X3N0b2NrX2lkKSBnX2ZyZWUoc3RvY2tfaWQpOworCiAgICAgaWYgKCF3cmFwcGVkX29iaikgewog ICAgICAgICBQSFBHX1RIUk9XX0NPTlNUUlVDVF9FWENFUFRJT04oR3RrQnV0dG9uKTsKICAgICB9 CkBAIC01MjUsOSArNTMwLDkgQEAgUEhQX01FVEhPRAogewogICAgIEdPYmplY3QgKndyYXBwZWRf b2JqOwogICAgIGdjaGFyICp0ZXh0ID0gTlVMTDsKLSAgICB6ZW5kX2Jvb2wgdXNlX3VuZGVybGlu ZSA9IDE7CisgICAgemVuZF9ib29sIGZyZWVfdGV4dCwgdXNlX3VuZGVybGluZSA9IDE7CiAKLSAg ICBpZiAoIXBocF9ndGtfcGFyc2VfYXJncyhaRU5EX05VTV9BUkdTKCksICJ8c2IiLCAmdGV4dCwg JnVzZV91bmRlcmxpbmUpKSB7CisgICAgaWYgKCFwaHBfZ3RrX3BhcnNlX2FyZ3MoWkVORF9OVU1f QVJHUygpLCAifHViIiwgJnRleHQsICZmcmVlX3RleHQsICZ1c2VfdW5kZXJsaW5lKSkgewogICAg ICAgICBQSFBHX1RIUk9XX0NPTlNUUlVDVF9FWENFUFRJT04oR3RrQ2hlY2tCdXR0b24pOwogICAg IH0KIApAQCAtNTM4LDYgKzU0Myw4IEBAIFBIUF9NRVRIT0QKICAgICAgICAgd3JhcHBlZF9vYmog PSAoR09iamVjdCAqKWdfb2JqZWN0X25ldyhwaHBnX2d0eXBlX2Zyb21fenZhbCh0aGlzX3B0ciks IE5VTEwpOwogICAgIH0KIAorICAgIGlmIChmcmVlX3RleHQpIGdfZnJlZSh0ZXh0KTsKKwogICAg IGlmICghd3JhcHBlZF9vYmopIHsKICAgICAgICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBU SU9OKEd0a0NoZWNrQnV0dG9uKTsKICAgICB9CkBAIC01NjEsOSArNTY4LDkgQEAgUEhQX01FVEhP RAogewogICAgIEdPYmplY3QgKndyYXBwZWRfb2JqOwogICAgIGdjaGFyICp0ZXh0ID0gTlVMTDsK LSAgICB6ZW5kX2Jvb2wgdXNlX3VuZGVybGluZSA9IDE7CisgICAgemVuZF9ib29sIGZyZWVfdGV4 dCwgdXNlX3VuZGVybGluZSA9IDE7CiAKLSAgICBpZiAoIXBocF9ndGtfcGFyc2VfYXJncyhaRU5E X05VTV9BUkdTKCksICJ8c2IiLCAmdGV4dCwgJnVzZV91bmRlcmxpbmUpKSB7CisgICAgaWYgKCFw aHBfZ3RrX3BhcnNlX2FyZ3MoWkVORF9OVU1fQVJHUygpLCAifHViIiwgJnRleHQsICZmcmVlX3Rl eHQsICZ1c2VfdW5kZXJsaW5lKSkgewogICAgICAgICBQSFBHX1RIUk9XX0NPTlNUUlVDVF9FWENF UFRJT04oR3RrTWVudUl0ZW0pOwogICAgIH0KIApAQCAtNTgxLDYgKzU4OCw4IEBAIFBIUF9NRVRI T0QKICAgICAgICAgZ3RrX3dpZGdldF9zaG93KGFjY2VsX2xhYmVsKTsKICAgICB9CiAKKyAgICBp ZiAoZnJlZV90ZXh0KSBnX2ZyZWUodGV4dCk7CisKICAgICBpZiAoIXdyYXBwZWRfb2JqKSB7CiAg ICAgICAgIFBIUEdfVEhST1dfQ09OU1RSVUNUX0VYQ0VQVElPTihHdGtNZW51SXRlbSk7CiAgICAg fQpAQCAtNjM3LDEzICs2NDYsMTQgQEAgb3ZlcnJpZGUgZ3RrX2RpYWxvZ19uZXdfd2l0aF9idXR0 b25zCiBQSFBfTUVUSE9ECiB7CiAgICAgY2hhciAqdGl0bGUgPSBOVUxMOworICAgIHplbmRfYm9v bCBmcmVlX3RpdGxlOwogICAgIEd0a1dpbmRvdyAqcGFyZW50ID0gTlVMTDsKICAgICB6dmFsICpw aHBfcGFyZW50ID0gTlVMTCwgKnBocF9mbGFncyA9IE5VTEw7CiAgICAgenZhbCAqYnV0dG9ucyA9 IE5VTEw7CiAgICAgR3RrRGlhbG9nRmxhZ3MgZmxhZ3MgPSAwOwogICAgIEdPYmplY3QgKndyYXBw ZWRfb2JqOwogCi0gICAgaWYgKCFwaHBfZ3RrX3BhcnNlX2FyZ3MoWkVORF9OVU1fQVJHUygpLCAi fHNOVmEiLCAmdGl0bGUsICZwaHBfcGFyZW50LCBndGt3aW5kb3dfY2UsICZwaHBfZmxhZ3MsICZi dXR0b25zKSkgeworICAgIGlmICghcGhwX2d0a19wYXJzZV9hcmdzKFpFTkRfTlVNX0FSR1MoKSwg Inx1TlZhIiwgJnRpdGxlLCAmZnJlZV90aXRsZSwgJnBocF9wYXJlbnQsIGd0a3dpbmRvd19jZSwg JnBocF9mbGFncywgJmJ1dHRvbnMpKSB7CiAgICAgICAgIFBIUEdfVEhST1dfQ09OU1RSVUNUX0VY Q0VQVElPTihHdGtEaWFsb2cpOwogICAgIH0KICAgICBpZiAocGhwX3BhcmVudCkgewpAQCAtNjU4 LDYgKzY2OCw5IEBAIFBIUF9NRVRIT0QKICAgICB9CiAKICAgICB3cmFwcGVkX29iaiA9IChHT2Jq ZWN0ICopZ19vYmplY3RfbmV3KHBocGdfZ3R5cGVfZnJvbV96dmFsKHRoaXNfcHRyKSwgTlVMTCk7 CisKKyAgICBpZiAoZnJlZV90aXRsZSkgZ19mcmVlKHRpdGxlKTsKKwogICAgIGlmICghd3JhcHBl ZF9vYmopIHsKICAgICAgICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBUSU9OKEd0a0RpYWxv Zyk7CiAgICAgfQpAQCAtNzg1LDYgKzc5OCw3IEBAIG92ZXJyaWRlIGd0a19maWxlX2Nob29zZXJf ZGlhbG9nX25ld193aXRoX2JhY2tlbmQKIFBIUF9NRVRIT0QKIHsKICAgICBjaGFyICp0aXRsZSA9 IE5VTEwsICpiYWNrZW5kID0gTlVMTDsKKyAgICB6ZW5kX2Jvb2wgZnJlZV90aXRsZSwgZnJlZV9i YWNrZW5kOwogICAgIHp2YWwgKnBocF9wYXJlbnQgPSBOVUxMLCAqcGhwX2FjdGlvbiA9IE5VTEw7 CiAgICAgenZhbCAqYnV0dG9ucyA9IE5VTEw7CiAgICAgR3RrV2luZG93ICpwYXJlbnQgPSBOVUxM OwpAQCAtNzkyLDggKzgwNiw4IEBAIFBIUF9NRVRIT0QKICAgICBHT2JqZWN0ICp3cmFwcGVkX29i ajsKICAgICBpbnQgbiA9IDA7CiAKLSAgICBpZiAoIXBocF9ndGtfcGFyc2VfYXJncyhaRU5EX05V TV9BUkdTKCksICJ8c05WYXMiLCAmdGl0bGUsICZwaHBfcGFyZW50LAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGd0a3dpbmRvd19jZSwgJnBocF9hY3Rpb24sICZidXR0b25zLCAmYmFja2Vu ZCkpIHsKKyAgICBpZiAoIXBocF9ndGtfcGFyc2VfYXJncyhaRU5EX05VTV9BUkdTKCksICJ8dU5W YXUiLCAmdGl0bGUsICZmcmVlX3RpdGxlLCAmcGhwX3BhcmVudCwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICBndGt3aW5kb3dfY2UsICZwaHBfYWN0aW9uLCAmYnV0dG9ucywgJmJhY2tlbmQs ICZmcmVlX2JhY2tlbmQpKSB7CiAgICAgICAgIFBIUEdfVEhST1dfQ09OU1RSVUNUX0VYQ0VQVElP TihHdGtGaWxlQ2hvb3NlckRpYWxvZyk7CiAgICAgfQogCkBAIC04MjEsNiArODM1LDEwIEBAIFBI UF9NRVRIT0QKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAidGl0 bGUiLCB0aXRsZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAi YWN0aW9uIiwgYWN0aW9uLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICJmaWxlLXN5c3RlbS1iYWNrZW5kIiwgYmFja2VuZCwgTlVMTCk7CisKKyAgICBpZiAoZnJl ZV90aXRsZSkgZ19mcmVlKHRpdGxlKTsKKyAgICBpZiAoZnJlZV9iYWNrZW5kKSBnX2ZyZWUoYmFj a2VuZCk7CisKICAgICBpZiAoIXdyYXBwZWRfb2JqKSB7CiAgICAgICAgIFBIUEdfVEhST1dfQ09O U1RSVUNUX0VYQ0VQVElPTihHdGtGaWxlQ2hvb3NlckRpYWxvZyk7CiAgICAgfQpAQCAtODc1LDkg Kzg5Myw5IEBAIFBIUF9NRVRIT0QKIHsKICAgICBHT2JqZWN0ICp3cmFwcGVkX29iajsKICAgICBn Y2hhciAqdGV4dCA9IE5VTEw7Ci0gICAgemVuZF9ib29sIHVzZV91bmRlcmxpbmUgPSAwOworICAg IHplbmRfYm9vbCBmcmVlX3RleHQsIHVzZV91bmRlcmxpbmUgPSAwOwogCi0gICAgaWYgKCFwaHBf Z3RrX3BhcnNlX2FyZ3MoWkVORF9OVU1fQVJHUygpLCAifHNiIiwgJnRleHQsICZ1c2VfdW5kZXJs aW5lKSkgeworICAgIGlmICghcGhwX2d0a19wYXJzZV9hcmdzKFpFTkRfTlVNX0FSR1MoKSwgInx1 YiIsICZ0ZXh0LCAmZnJlZV90ZXh0LCAmdXNlX3VuZGVybGluZSkpIHsKICAgICAgICAgUEhQR19U SFJPV19DT05TVFJVQ1RfRVhDRVBUSU9OKEd0a0xhYmVsKTsKICAgICB9CiAKQEAgLTg4OCw2ICs5 MDYsOCBAQCBQSFBfTUVUSE9ECiAgICAgICAgIHdyYXBwZWRfb2JqID0gKEdPYmplY3QgKilnX29i amVjdF9uZXcocGhwZ19ndHlwZV9mcm9tX3p2YWwodGhpc19wdHIpLCBOVUxMKTsKICAgICB9CiAK KyAgICBpZiAoZnJlZV90ZXh0KSBnX2ZyZWUodGV4dCk7CisKICAgICBpZiAoIXdyYXBwZWRfb2Jq KSB7CiAgICAgICAgIFBIUEdfVEhST1dfQ09OU1RSVUNUX0VYQ0VQVElPTihHdGtMYWJlbCk7CiAg ICAgfQpAQCAtMTA0NSw2ICsxMDY1LDcgQEAgUEhQX01FVEhPRAogICAgIEd0a01lc3NhZ2VUeXBl IHR5cGUgPSBHVEtfTUVTU0FHRV9JTkZPOwogICAgIEd0a0J1dHRvbnNUeXBlIGJ1dHRvbnMgPSBH VEtfQlVUVE9OU19OT05FOwogICAgIGNoYXIgKm1lc3NhZ2UgPSBOVUxMOworICAgIHplbmRfYm9v bCBmcmVlX21lc3NhZ2U7CiAgICAgR09iamVjdCAqd3JhcHBlZF9vYmo7CiAKICAgICBpZiAocGhw Z19ndHlwZV9mcm9tX3p2YWwodGhpc19wdHIpICE9IEdUS19UWVBFX01FU1NBR0VfRElBTE9HKSB7 CkBAIC0xMDUyLDcgKzEwNzMsNyBAQCBQSFBfTUVUSE9ECiAgICAgICAgIHJldHVybjsKICAgICB9 CiAKLSAgICBpZiAoIXBocF9ndGtfcGFyc2VfYXJncyhaRU5EX05VTV9BUkdTKCksICJ8TlZWVnMi LCAmcGhwX3BhcmVudCwgZ3Rrd2luZG93X2NlLCAmcGhwX2ZsYWdzLCAmcGhwX3R5cGUsICZwaHBf YnV0dG9ucywgJm1lc3NhZ2UpKSB7CisgICAgaWYgKCFwaHBfZ3RrX3BhcnNlX2FyZ3MoWkVORF9O VU1fQVJHUygpLCAifE5WVlZ1IiwgJnBocF9wYXJlbnQsIGd0a3dpbmRvd19jZSwgJnBocF9mbGFn cywgJnBocF90eXBlLCAmcGhwX2J1dHRvbnMsICZtZXNzYWdlLCAmZnJlZV9tZXNzYWdlKSkgewog ICAgICAgICBQSFBHX1RIUk9XX0NPTlNUUlVDVF9FWENFUFRJT04oR3RrTWVzc2FnZURpYWxvZyk7 CiAgICAgfQogCkBAIC0xMDgwLDYgKzExMDEsOSBAQCBQSFBfTUVUSE9ECiAgICAgfQogCiAgICAg d3JhcHBlZF9vYmogPSAoR09iamVjdCAqKSBndGtfbWVzc2FnZV9kaWFsb2dfbmV3KHBhcmVudCwg ZmxhZ3MsIHR5cGUsIGJ1dHRvbnMsICIlcyIsIG1lc3NhZ2UpOworCisgICAgaWYgKGZyZWVfbWVz c2FnZSkgZ19mcmVlKG1lc3NhZ2UpOworCiAgICAgaWYgKCF3cmFwcGVkX29iaikgewogICAgICAg ICBQSFBHX1RIUk9XX0NPTlNUUlVDVF9FWENFUFRJT04oR3RrTWVzc2FnZURpYWxvZyk7CiAgICAg fQpAQCAtMTEwMyw5ICsxMTI3LDkgQEAgUEhQX01FVEhPRAogewogICAgIEdPYmplY3QgKndyYXBw ZWRfb2JqOwogICAgIGdjaGFyICp0ZXh0ID0gTlVMTDsKLSAgICB6ZW5kX2Jvb2wgdXNlX3VuZGVy bGluZSA9IDE7CisgICAgemVuZF9ib29sIGZyZWVfdGV4dCwgdXNlX3VuZGVybGluZSA9IDE7CiAK LSAgICBpZiAoIXBocF9ndGtfcGFyc2VfYXJncyhaRU5EX05VTV9BUkdTKCksICJ8c2IiLCAmdGV4 dCwgJnVzZV91bmRlcmxpbmUpKSB7CisgICAgaWYgKCFwaHBfZ3RrX3BhcnNlX2FyZ3MoWkVORF9O VU1fQVJHUygpLCAifHViIiwgJnRleHQsICZmcmVlX3RleHQsICZ1c2VfdW5kZXJsaW5lKSkgewog ICAgICAgICBQSFBHX1RIUk9XX0NPTlNUUlVDVF9FWENFUFRJT04oR3RrTWVudUl0ZW0pOwogICAg IH0KIApAQCAtMTEyMyw2ICsxMTQ3LDggQEAgUEhQX01FVEhPRAogICAgICAgICBndGtfd2lkZ2V0 X3Nob3coYWNjZWxfbGFiZWwpOwogICAgIH0KIAorICAgIGlmIChmcmVlX3RleHQpIGdfZnJlZSh0 ZXh0KTsKKwogICAgIGlmICghd3JhcHBlZF9vYmopIHsKICAgICAgICAgUEhQR19USFJPV19DT05T VFJVQ1RfRVhDRVBUSU9OKEd0a01lbnVJdGVtKTsKICAgICB9CkBAIC0xMTgyLDEyICsxMjA4LDEy IEBAIFBIUF9NRVRIT0QKIHsKICAgICB6dmFsICpwaHBfZ3JvdXAgPSBOVUxMOwogICAgIGNoYXIg KmxhYmVsID0gTlVMTDsKLSAgICB6ZW5kX2Jvb2wgdXNlX3VuZGVybGluZSA9IDE7CisgICAgemVu ZF9ib29sIGZyZWVfbGFiZWwsIHVzZV91bmRlcmxpbmUgPSAxOwogICAgIEd0a1JhZGlvTWVudUl0 ZW0gKmdyb3VwID0gTlVMTDsKICAgICBHT2JqZWN0ICp3cmFwcGVkX29iajsKICAgICBHVHlwZSBn dHlwZSA9IHBocGdfZ3R5cGVfZnJvbV96dmFsKHRoaXNfcHRyKTsKIAotICAgIGlmICghcGhwX2d0 a19wYXJzZV9hcmdzKFpFTkRfTlVNX0FSR1MoKSwgInxOc2IiLCAmcGhwX2dyb3VwLCBndGtyYWRp b21lbnVpdGVtX2NlLCAmbGFiZWwsICZ1c2VfdW5kZXJsaW5lKSkgeworICAgIGlmICghcGhwX2d0 a19wYXJzZV9hcmdzKFpFTkRfTlVNX0FSR1MoKSwgInxOdWIiLCAmcGhwX2dyb3VwLCBndGtyYWRp b21lbnVpdGVtX2NlLCAmbGFiZWwsICZmcmVlX2xhYmVsLCAmdXNlX3VuZGVybGluZSkpIHsKICAg ICAgICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBUSU9OKEd0a1JhZGlvQnV0dG9uKTsKICAg ICB9CiAKQEAgLTEyMTMsNiArMTIzOSw4IEBAIFBIUF9NRVRIT0QKICAgICAgICAgZ3RrX3JhZGlv X21lbnVfaXRlbV9zZXRfZ3JvdXAoR1RLX1JBRElPX01FTlVfSVRFTSh3cmFwcGVkX29iaiksIGd0 a19yYWRpb19tZW51X2l0ZW1fZ2V0X2dyb3VwKGdyb3VwKSk7CiAgICAgfQogCisgICAgaWYgKGZy ZWVfbGFiZWwpIGdfZnJlZShsYWJlbCk7CisKICAgICBpZiAoIXdyYXBwZWRfb2JqKSB7CiAgICAg ICAgIFBIUEdfVEhST1dfQ09OU1RSVUNUX0VYQ0VQVElPTihHdGtSYWRpb0J1dHRvbik7CiAgICAg fQpAQCAtMTI4OCwxMiArMTMxNiwxMiBAQCBQSFBfTUVUSE9ECiB7CiAgICAgenZhbCAqcGhwX2dy b3VwID0gTlVMTDsKICAgICBjaGFyICpsYWJlbCA9IE5VTEw7Ci0gICAgemVuZF9ib29sIHVzZV91 bmRlcmxpbmUgPSAxOworICAgIHplbmRfYm9vbCBmcmVlX2xhYmVsLCB1c2VfdW5kZXJsaW5lID0g MTsKICAgICBHdGtSYWRpb0J1dHRvbiAqZ3JvdXAgPSBOVUxMOwogICAgIEdPYmplY3QgKndyYXBw ZWRfb2JqOwogICAgIEdUeXBlIGd0eXBlID0gcGhwZ19ndHlwZV9mcm9tX3p2YWwodGhpc19wdHIp OwogCi0gICAgaWYgKCFwaHBfZ3RrX3BhcnNlX2FyZ3MoWkVORF9OVU1fQVJHUygpLCAifE5zYiIs ICZwaHBfZ3JvdXAsIGd0a3JhZGlvYnV0dG9uX2NlLCAmbGFiZWwsICZ1c2VfdW5kZXJsaW5lKSkg eworICAgIGlmICghcGhwX2d0a19wYXJzZV9hcmdzKFpFTkRfTlVNX0FSR1MoKSwgInxOdWIiLCAm cGhwX2dyb3VwLCBndGtyYWRpb2J1dHRvbl9jZSwgJmxhYmVsLCAmZnJlZV9sYWJlbCwgJnVzZV91 bmRlcmxpbmUpKSB7CiAgICAgICAgIFBIUEdfVEhST1dfQ09OU1RSVUNUX0VYQ0VQVElPTihHdGtS YWRpb0J1dHRvbik7CiAgICAgfQogCkBAIC0xMzE3LDYgKzEzNDUsOCBAQCBQSFBfTUVUSE9ECiAg ICAgICAgIH0KICAgICB9CiAKKyAgICBpZiAoZnJlZV9sYWJlbCkgZ19mcmVlKGxhYmVsKTsKKwog ICAgIGlmICghd3JhcHBlZF9vYmopIHsKICAgICAgICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhD RVBUSU9OKEd0a1JhZGlvQnV0dG9uKTsKICAgICB9CkBAIC0xMzQyLDEwICsxMzcyLDExIEBAIFBI UF9NRVRIT0QKICAgICB6dmFsICpwaHBfZ3JvdXAgPSBOVUxMOwogICAgIEd0a1JhZGlvVG9vbEJ1 dHRvbiAqZ3JvdXAgPSBOVUxMOwogICAgIGNoYXIgKnN0b2NrX2lkID0gTlVMTDsKKyAgICB6ZW5k X2Jvb2wgZnJlZV9zdG9ja19pZDsKICAgICBHT2JqZWN0ICp3cmFwcGVkX29iajsKICAgICBHVHlw ZSBndHlwZSA9IHBocGdfZ3R5cGVfZnJvbV96dmFsKHRoaXNfcHRyKTsKIAotICAgIGlmICghcGhw X2d0a19wYXJzZV9hcmdzKFpFTkRfTlVNX0FSR1MoKSwgInxOcyIsICZwaHBfZ3JvdXAsIGd0a3Jh ZGlvdG9vbGJ1dHRvbl9jZSwgJnN0b2NrX2lkKSkgeworICAgIGlmICghcGhwX2d0a19wYXJzZV9h cmdzKFpFTkRfTlVNX0FSR1MoKSwgInxOdSIsICZwaHBfZ3JvdXAsIGd0a3JhZGlvdG9vbGJ1dHRv bl9jZSwgJnN0b2NrX2lkLCAmZnJlZV9zdG9ja19pZCkpIHsKICAgICAgICAgUEhQR19USFJPV19D T05TVFJVQ1RfRVhDRVBUSU9OKEd0a1JhZGlvVG9vbEJ1dHRvbik7CiAgICAgfQogCkBAIC0xMzY3 LDYgKzEzOTgsOCBAQCBQSFBfTUVUSE9ECiAgICAgICAgIH0KICAgICB9CiAKKyAgICBpZiAoZnJl ZV9zdG9ja19pZCkgZ19mcmVlKHN0b2NrX2lkKTsKKwogICAgIGlmICghd3JhcHBlZF9vYmopIHsK ICAgICAgICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBUSU9OKEd0a1JhZGlvVG9vbEJ1dHRv bik7CiAgICAgfQpAQCAtMTQ3OCw5ICsxNTExLDkgQEAgUEhQX01FVEhPRAogewogICAgIEdPYmpl Y3QgKndyYXBwZWRfb2JqOwogICAgIGdjaGFyICp0ZXh0ID0gTlVMTDsKLSAgICB6ZW5kX2Jvb2wg dXNlX3VuZGVybGluZSA9IDE7CisgICAgemVuZF9ib29sIGZyZWVfdGV4dCwgdXNlX3VuZGVybGlu ZSA9IDE7CiAKLSAgICBpZiAoIXBocF9ndGtfcGFyc2VfYXJncyhaRU5EX05VTV9BUkdTKCksICJ8 c2IiLCAmdGV4dCwgJnVzZV91bmRlcmxpbmUpKSB7CisgICAgaWYgKCFwaHBfZ3RrX3BhcnNlX2Fy Z3MoWkVORF9OVU1fQVJHUygpLCAifHViIiwgJnRleHQsICZmcmVlX3RleHQsICZ1c2VfdW5kZXJs aW5lKSkgewogICAgICAgICBQSFBHX1RIUk9XX0NPTlNUUlVDVF9FWENFUFRJT04oR3RrVG9nZ2xl QnV0dG9uKTsKICAgICB9CiAKQEAgLTE0OTEsNiArMTUyNCw4IEBAIFBIUF9NRVRIT0QKICAgICAg ICAgd3JhcHBlZF9vYmogPSAoR09iamVjdCAqKWdfb2JqZWN0X25ldyhwaHBnX2d0eXBlX2Zyb21f enZhbCh0aGlzX3B0ciksIE5VTEwpOwogICAgIH0KIAorICAgIGlmIChmcmVlX3RleHQpIGdfZnJl ZSh0ZXh0KTsKKwogICAgIGlmICghd3JhcHBlZF9vYmopIHsKICAgICAgICAgUEhQR19USFJPV19D T05TVFJVQ1RfRVhDRVBUSU9OKEd0a1RvZ2dsZUJ1dHRvbik7CiAgICAgfQ== --b83ffb269927d7db794c02f7364292d88df4169f--