com php/gtk-src: Fixed more tsrmls stuff Compiles now in ZTS mode: ext/gtk+/gtk-2.10.overrides ext/gtk+/gtk-2.12.overrides ext/gtk+/gtk.overrides ext/gtk+/gtktreeview.overrides ext/gtk+/php_gtk+_types.c ext/scintilla/scintilla.in generator/templates.php main/phpg_gobject.c

--9095ca772eeebfad1d5937a5c3a9adfe19bdeac2
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Commit:    ba6ed42850464c6eae51a0d65fb29bf3b976b5ac=0AAuthor:    Elizabeth =
M Smith <[email protected]>         Wed, 18 Jul 2012 12:58:11 -0400=
=0AParents:   0c07e8033566f64000661c698ad6cde4fbf56210=0ABranches:  master=
=0A=0ALink:       http://git.php.net/?p=3Dphp/gtk-src.git;a=3Dcommitdiff;h=
=3Dba6ed42850464c6eae51a0d65fb29bf3b976b5ac=0A=0ALog:=0AFixed more tsrmls s=
tuff=0ACompiles now in ZTS mode=0A=0AChanged paths:=0A  M  ext/gtk+/gtk-2.1=
0.overrides=0A  M  ext/gtk+/gtk-2.12.overrides=0A  M  ext/gtk+/gtk.override=
s=0A  M  ext/gtk+/gtktreeview.overrides=0A  M  ext/gtk+/php_gtk+_types.c=0A=
  M  ext/scintilla/scintilla.in=0A  M  generator/templates.php=0A  M  main/=
phpg_gobject.c=0A=0A
--9095ca772eeebfad1d5937a5c3a9adfe19bdeac2
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="diff_ba6ed42850464c6eae51a0d65fb29bf3b976b5ac.txt"

ZGlmZiAtLWdpdCBhL2V4dC9ndGsrL2d0ay0yLjEwLm92ZXJyaWRlcyBiL2V4dC9ndGsrL2d0ay0y
LjEwLm92ZXJyaWRlcwppbmRleCA2NmUzNTU0Li5lOTg4MGQ1IDEwMDY0NAotLS0gYS9leHQvZ3Rr
Ky9ndGstMi4xMC5vdmVycmlkZXMKKysrIGIvZXh0L2d0aysvZ3RrLTIuMTAub3ZlcnJpZGVzCkBA
IC01MzUsNyArNTM1LDcgQEAgUEhQX01FVEhPRAogICAgICAgICB9CiAgICAgfQogCi0gICAgd3Jh
cHBlZF9vYmogPSAoR09iamVjdCAqKWdfb2JqZWN0X25ldyhwaHBnX2d0eXBlX2Zyb21fenZhbCh0
aGlzX3B0ciksIE5VTEwpOworICAgIHdyYXBwZWRfb2JqID0gKEdPYmplY3QgKilnX29iamVjdF9u
ZXcocGhwZ19ndHlwZV9mcm9tX3p2YWwodGhpc19wdHIgVFNSTUxTX0NDKSwgTlVMTCk7CiAgICAg
aWYoIXdyYXBwZWRfb2JqKSB7IFBIUEdfVEhST1dfQ09OU1RSVUNUX0VYQ0VQVElPTihHdGtSZWNl
bnRDaG9vc2VyRGlhbG9nKTsgfSAgICAKIAogICAgIGlmKGJ1dHRvbnMpIHsKZGlmZiAtLWdpdCBh
L2V4dC9ndGsrL2d0ay0yLjEyLm92ZXJyaWRlcyBiL2V4dC9ndGsrL2d0ay0yLjEyLm92ZXJyaWRl
cwppbmRleCBhMTU2ODJkLi45YTM2NTYxIDEwMDY0NAotLS0gYS9leHQvZ3RrKy9ndGstMi4xMi5v
dmVycmlkZXMKKysrIGIvZXh0L2d0aysvZ3RrLTIuMTIub3ZlcnJpZGVzCkBAIC01ODgsNyArNTg4
LDcgQEAgUEhQX01FVEhPRAogCQlyZXR1cm47CiAJfQogCi0Jb2JqID0gKEdPYmplY3QgKilnX29i
amVjdF9uZXd2KHBocGdfZ3R5cGVfZnJvbV96dmFsKHRoaXNfcHRyKSwwLE5VTEwpOworCW9iaiA9
IChHT2JqZWN0ICopZ19vYmplY3RfbmV3dihwaHBnX2d0eXBlX2Zyb21fenZhbCh0aGlzX3B0ciBU
U1JNTFNfQ0MpLDAsTlVMTCk7CiAJCWlmKCFvYmopIHsgUEhQR19USFJPV19DT05TVFJVQ1RfRVhD
RVBUSU9OKEd0a1NjYWxlQnV0dG9uKTsgfQogCQlhZGogPSAoR3RrQWRqdXN0bWVudCAqKWd0a19h
ZGp1c3RtZW50X25ldyhtaW4sbWluLG1heCxzdGVwLHN0ZXAsMCk7CiAJCWd0a19zY2FsZV9idXR0
b25fc2V0X2FkanVzdG1lbnQoR1RLX1NDQUxFX0JVVFRPTihvYmopLEdUS19BREpVU1RNRU5UKGFk
aikpOwpkaWZmIC0tZ2l0IGEvZXh0L2d0aysvZ3RrLm92ZXJyaWRlcyBiL2V4dC9ndGsrL2d0ay5v
dmVycmlkZXMKaW5kZXggNWY2ZmY4OC4uYzcwOGNiNiAxMDA2NDQKLS0tIGEvZXh0L2d0aysvZ3Rr
Lm92ZXJyaWRlcworKysgYi9leHQvZ3RrKy9ndGsub3ZlcnJpZGVzCkBAIC0xMzAwLDcgKzEzMDAs
NyBAQCBQSFBfTUVUSE9ECiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInBhZ2VfaW5j
cmVtZW50IiwgcGFnZV9pbmNyLCAicGFnZV9zaXplIiwgcGFnZV9zaXplLCBOVUxMKTsKIAogICAg
IGlmICghd3JhcHBlZF9vYmopIHsKLSAgICAgICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBU
SU9OKEd0a0FkanVzdG1lbnQgVFNSTUxTX0NDKTsKKyAgICAgICAgUEhQR19USFJPV19DT05TVFJV
Q1RfRVhDRVBUSU9OKEd0a0FkanVzdG1lbnQpOwogICAgIH0KIAogICAgIHBocGdfZ29iamVjdF9z
ZXRfd3JhcHBlcih0aGlzX3B0ciwgd3JhcHBlZF9vYmogVFNSTUxTX0NDKTsKQEAgLTEzNzYsNyAr
MTM3Niw3IEBAIFBIUF9NRVRIT0QKICAgICB6ZW5kX2Jvb2wgZnJlZV90ZXh0ID0gRkFMU0UsIHVz
ZV91bmRlcmxpbmUgPSAxOwogCiAgICAgaWYgKCFwaHBfZ3RrX3BhcnNlX2FyZ3MoWkVORF9OVU1f
QVJHUygpLCAifHViIiwgJnRleHQsICZmcmVlX3RleHQsICZ1c2VfdW5kZXJsaW5lKSkgewotICAg
ICAgICBQSFBHX1RIUk9XX0NPTlNUUlVDVF9FWENFUFRJT04oR3RrQnV0dG9uIFRTUk1MU19DQyk7
CisgICAgICAgIFBIUEdfVEhST1dfQ09OU1RSVUNUX0VYQ0VQVElPTihHdGtCdXR0b24pOwogICAg
IH0KIAogICAgIGlmICh0ZXh0KSB7CkBAIC0xMzg5LDcgKzEzODksNyBAQCBQSFBfTUVUSE9ECiAg
ICAgaWYgKGZyZWVfdGV4dCkgZ19mcmVlKHRleHQpOwogCiAgICAgaWYgKCF3cmFwcGVkX29iaikg
ewotICAgICAgICBQSFBHX1RIUk9XX0NPTlNUUlVDVF9FWENFUFRJT04oR3RrQnV0dG9uIFRTUk1M
U19DQyk7CisgICAgICAgIFBIUEdfVEhST1dfQ09OU1RSVUNUX0VYQ0VQVElPTihHdGtCdXR0b24p
OwogICAgIH0KIAogICAgIHBocGdfZ29iamVjdF9zZXRfd3JhcHBlcih0aGlzX3B0ciwgd3JhcHBl
ZF9vYmogVFNSTUxTX0NDKTsKQEAgLTE0MTEsNyArMTQxMSw3IEBAIFBIUF9NRVRIT0QKICAgICB6
ZW5kX2Jvb2wgZnJlZV9zdG9ja19pZDsKIAogICAgIGlmICghcGhwX2d0a19wYXJzZV9hcmdzKFpF
TkRfTlVNX0FSR1MoKSwgInUiLCAmc3RvY2tfaWQsICZmcmVlX3N0b2NrX2lkKSkgewotICAgICAg
ICBQSFBHX1RIUk9XX0NPTlNUUlVDVF9FWENFUFRJT04oR3RrQnV0dG9uIFRTUk1MU19DQyk7Cisg
ICAgICAgIFBIUEdfVEhST1dfQ09OU1RSVUNUX0VYQ0VQVElPTihHdGtCdXR0b24pOwogICAgIH0K
IAogICAgIHdyYXBwZWRfb2JqID0gKEdPYmplY3QgKilnX29iamVjdF9uZXcocGhwZ19ndHlwZV9m
cm9tX2NsYXNzKEVHKHNjb3BlKSBUU1JNTFNfQ0MpLCAibGFiZWwiLCBzdG9ja19pZCwKQEAgLTE0
MjAsNyArMTQyMCw3IEBAIFBIUF9NRVRIT0QKICAgICBpZiAoZnJlZV9zdG9ja19pZCkgZ19mcmVl
KHN0b2NrX2lkKTsKIAogICAgIGlmICghd3JhcHBlZF9vYmopIHsKLSAgICAgICAgUEhQR19USFJP
V19DT05TVFJVQ1RfRVhDRVBUSU9OKEd0a0J1dHRvbiBUU1JNTFNfQ0MpOworICAgICAgICBQSFBH
X1RIUk9XX0NPTlNUUlVDVF9FWENFUFRJT04oR3RrQnV0dG9uKTsKICAgICB9CiAKICAgICBwaHBn
X2dvYmplY3RfbmV3KCZyZXR1cm5fdmFsdWUsIHdyYXBwZWRfb2JqIFRTUk1MU19DQyk7CkBAIC0x
NTIwLDcgKzE1MjAsNyBAQCBQSFBfTUVUSE9ECiAgICAgemVuZF9ib29sIGZyZWVfdGV4dCA9IEZB
TFNFLCB1c2VfdW5kZXJsaW5lID0gMTsKIAogICAgIGlmICghcGhwX2d0a19wYXJzZV9hcmdzKFpF
TkRfTlVNX0FSR1MoKSwgInx1YiIsICZ0ZXh0LCAmZnJlZV90ZXh0LCAmdXNlX3VuZGVybGluZSkp
IHsKLSAgICAgICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBUSU9OKEd0a0NoZWNrQnV0dG9u
IFRTUk1MU19DQyk7CisgICAgICAgIFBIUEdfVEhST1dfQ09OU1RSVUNUX0VYQ0VQVElPTihHdGtD
aGVja0J1dHRvbik7CiAgICAgfQogCiAgICAgaWYgKHRleHQpIHsKQEAgLTE1MzMsNyArMTUzMyw3
IEBAIFBIUF9NRVRIT0QKICAgICBpZiAoZnJlZV90ZXh0KSBnX2ZyZWUodGV4dCk7CiAKICAgICBp
ZiAoIXdyYXBwZWRfb2JqKSB7Ci0gICAgICAgIFBIUEdfVEhST1dfQ09OU1RSVUNUX0VYQ0VQVElP
TihHdGtDaGVja0J1dHRvbiBUU1JNTFNfQ0MpOworICAgICAgICBQSFBHX1RIUk9XX0NPTlNUUlVD
VF9FWENFUFRJT04oR3RrQ2hlY2tCdXR0b24pOwogICAgIH0KIAogICAgIHBocGdfZ29iamVjdF9z
ZXRfd3JhcHBlcih0aGlzX3B0ciwgd3JhcHBlZF9vYmogVFNSTUxTX0NDKTsKQEAgLTE1NTgsNyAr
MTU1OCw3IEBAIFBIUF9NRVRIT0QKICAgICB6ZW5kX2Jvb2wgZnJlZV90ZXh0ID0gRkFMU0UsIHVz
ZV91bmRlcmxpbmUgPSAxOwogCiAgICAgaWYgKCFwaHBfZ3RrX3BhcnNlX2FyZ3MoWkVORF9OVU1f
QVJHUygpLCAifHViIiwgJnRleHQsICZmcmVlX3RleHQsICZ1c2VfdW5kZXJsaW5lKSkgewotICAg
ICAgICBQSFBHX1RIUk9XX0NPTlNUUlVDVF9FWENFUFRJT04oR3RrTWVudUl0ZW0gVFNSTUxTX0ND
KTsKKyAgICAgICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBUSU9OKEd0a01lbnVJdGVtKTsK
ICAgICB9CiAKICAgICB3cmFwcGVkX29iaiA9IChHT2JqZWN0ICopZ19vYmplY3RfbmV3KHBocGdf
Z3R5cGVfZnJvbV96dmFsKHRoaXNfcHRyIFRTUk1MU19DQyksIE5VTEwpOwpAQCAtMTU3OCw3ICsx
NTc4LDcgQEAgUEhQX01FVEhPRAogICAgIGlmIChmcmVlX3RleHQpIGdfZnJlZSh0ZXh0KTsKIAog
ICAgIGlmICghd3JhcHBlZF9vYmopIHsKLSAgICAgICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhD
RVBUSU9OKEd0a01lbnVJdGVtIFRTUk1MU19DQyk7CisgICAgICAgIFBIUEdfVEhST1dfQ09OU1RS
VUNUX0VYQ0VQVElPTihHdGtNZW51SXRlbSk7CiAgICAgfQogCiAgICAgcGhwZ19nb2JqZWN0X3Nl
dF93cmFwcGVyKHRoaXNfcHRyLCB3cmFwcGVkX29iaiBUU1JNTFNfQ0MpOwpAQCAtMjE4MCwxMCAr
MjE4MCwxMCBAQCBQSFBfTUVUSE9ECiAgICAgfQogCiAgICAgaWYgKHBocF9tb2RlbCAmJiBaX1RZ
UEVfUChwaHBfbW9kZWwpICE9IElTX05VTEwpIHsKLSAgICAgICAgd3JhcHBlZF9vYmogPSAoR09i
amVjdCAqKWdfb2JqZWN0X25ldyhwaHBnX2d0eXBlX2Zyb21fenZhbCh0aGlzX3B0ciksICJtb2Rl
bCIsCisgICAgICAgIHdyYXBwZWRfb2JqID0gKEdPYmplY3QgKilnX29iamVjdF9uZXcocGhwZ19n
dHlwZV9mcm9tX3p2YWwodGhpc19wdHIgVFNSTUxTX0NDKSwgIm1vZGVsIiwKICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHVEtfVFJFRV9NT0RFTChQSFBHX0dP
QkpFQ1QocGhwX21vZGVsKSksIE5VTEwpOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIHdyYXBwZWRf
b2JqID0gKEdPYmplY3QgKilnX29iamVjdF9uZXcocGhwZ19ndHlwZV9mcm9tX3p2YWwodGhpc19w
dHIpLCBOVUxMKTsKKyAgICAgICAgd3JhcHBlZF9vYmogPSAoR09iamVjdCAqKWdfb2JqZWN0X25l
dyhwaHBnX2d0eXBlX2Zyb21fenZhbCh0aGlzX3B0ciBUU1JNTFNfQ0MpLCBOVUxMKTsKICAgICB9
CiAKICAgICBpZiAoIXdyYXBwZWRfb2JqKSB7CkBAIC0yMjcwLDExICsyMjcwLDExIEBAIFBIUF9N
RVRIT0QKIAl9CiAKICAgICBpZiAobW9kZWwgJiYgWl9UWVBFX1AobW9kZWwpICE9IElTX05VTEwp
IHsKLSAgICAgICAgd3JhcHBlZF9vYmogPSAoR09iamVjdCAqKWdfb2JqZWN0X25ldyhwaHBnX2d0
eXBlX2Zyb21fenZhbCh0aGlzX3B0ciksICJtb2RlbCIsCisgICAgICAgIHdyYXBwZWRfb2JqID0g
KEdPYmplY3QgKilnX29iamVjdF9uZXcocGhwZ19ndHlwZV9mcm9tX3p2YWwodGhpc19wdHIgVFNS
TUxTX0NDKSwgIm1vZGVsIiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICBHVEtfVFJFRV9NT0RFTChQSFBHX0dPQkpFQ1QobW9kZWwpKSwKICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAidGV4dC1jb2x1bW4iLCB0ZXh0X2Nv
bHVtbiwgTlVMTCk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgd3JhcHBlZF9vYmogPSAoR09iamVj
dCAqKWdfb2JqZWN0X25ldyhwaHBnX2d0eXBlX2Zyb21fenZhbCh0aGlzX3B0ciksIE5VTEwpOwor
ICAgICAgICB3cmFwcGVkX29iaiA9IChHT2JqZWN0ICopZ19vYmplY3RfbmV3KHBocGdfZ3R5cGVf
ZnJvbV96dmFsKHRoaXNfcHRyIFRTUk1MU19DQyksIE5VTEwpOwogICAgIH0KIAogICAgIGlmICgh
d3JhcHBlZF9vYmopIHsKQEAgLTI1OTgsNyArMjU5OCw3IEBAIFBIUF9NRVRIT0QKICAgICAgICAg
UEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBUSU9OKEd0a0RpYWxvZyk7CiAgICAgfQogCi0gICAg
d3JhcHBlZF9vYmogPSAoR09iamVjdCAqKWdfb2JqZWN0X25ldyhwaHBnX2d0eXBlX2Zyb21fenZh
bCh0aGlzX3B0ciksIE5VTEwpOworICAgIHdyYXBwZWRfb2JqID0gKEdPYmplY3QgKilnX29iamVj
dF9uZXcocGhwZ19ndHlwZV9mcm9tX3p2YWwodGhpc19wdHIgVFNSTUxTX0NDKSwgTlVMTCk7CiAK
ICAgICBpZiAoIXdyYXBwZWRfb2JqKSB7CiAgICAgICAgIFBIUEdfVEhST1dfQ09OU1RSVUNUX0VY
Q0VQVElPTihHdGtEaWFsb2cpOwpAQCAtMjc3Myw3ICsyNzczLDcgQEAgUEhQX01FVEhPRAogICAg
ICAgICBQSFBHX1RIUk9XX0NPTlNUUlVDVF9FWENFUFRJT04oR3RrRW50cnkpOwogICAgIH0KIAot
ICAgIHdyYXBwZWRfb2JqID0gKEdPYmplY3QgKilnX29iamVjdF9uZXcocGhwZ19ndHlwZV9mcm9t
X3p2YWwodGhpc19wdHIpLAorICAgIHdyYXBwZWRfb2JqID0gKEdPYmplY3QgKilnX29iamVjdF9u
ZXcocGhwZ19ndHlwZV9mcm9tX3p2YWwodGhpc19wdHIgVFNSTUxTX0NDKSwKICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJtYXgtbGVuZ3RoIiwgbWF4LCAidGV4dCIs
IHRleHQsIE5VTEwpOwogCiAgICAgaWYgKGZyZWVfdGV4dCkgZ19mcmVlKHRleHQpOwpAQCAtMzU3
MSw3ICszNTcxLDcgQEAgUEhQX01FVEhPRAogICAgICAgICBQSFBHX1RIUk9XX0NPTlNUUlVDVF9F
WENFUFRJT04oR3RrRmlsZUNob29zZXJEaWFsb2cpOwogICAgIH0KIAotICAgIHdyYXBwZWRfb2Jq
ID0gKEdPYmplY3QgKikgZ19vYmplY3RfbmV3KHBocGdfZ3R5cGVfZnJvbV96dmFsKHRoaXNfcHRy
KSwKKyAgICB3cmFwcGVkX29iaiA9IChHT2JqZWN0ICopIGdfb2JqZWN0X25ldyhwaHBnX2d0eXBl
X2Zyb21fenZhbCh0aGlzX3B0ciBUU1JNTFNfQ0MpLAogICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICJ0aXRsZSIsIHRpdGxlLAogICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICJhY3Rpb24iLCBhY3Rpb24sCiAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgImZpbGUtc3lzdGVtLWJhY2tlbmQiLCBiYWNrZW5k
LCBOVUxMKTsKQEAgLTM4MzAsMTAgKzM4MzAsMTAgQEAgUEhQX01FVEhPRAogICAgIH0KIAogICAg
IGlmIChwaHBfbW9kZWwgJiYgWl9UWVBFX1AocGhwX21vZGVsKSAhPSBJU19OVUxMKSB7Ci0gICAg
ICAgIHdyYXBwZWRfb2JqID0gKEdPYmplY3QgKilnX29iamVjdF9uZXcocGhwZ19ndHlwZV9mcm9t
X3p2YWwodGhpc19wdHIpLCAibW9kZWwiLAorICAgICAgICB3cmFwcGVkX29iaiA9IChHT2JqZWN0
ICopZ19vYmplY3RfbmV3KHBocGdfZ3R5cGVfZnJvbV96dmFsKHRoaXNfcHRyIFRTUk1MU19DQyks
ICJtb2RlbCIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
R1RLX1RSRUVfTU9ERUwoUEhQR19HT0JKRUNUKHBocF9tb2RlbCkpLCBOVUxMKTsKICAgICB9IGVs
c2UgewotICAgICAgICB3cmFwcGVkX29iaiA9IChHT2JqZWN0ICopZ19vYmplY3RfbmV3KHBocGdf
Z3R5cGVfZnJvbV96dmFsKHRoaXNfcHRyKSwgTlVMTCk7CisgICAgICAgIHdyYXBwZWRfb2JqID0g
KEdPYmplY3QgKilnX29iamVjdF9uZXcocGhwZ19ndHlwZV9mcm9tX3p2YWwodGhpc19wdHIgVFNS
TUxTX0NDKSwgTlVMTCk7CiAgICAgfQogCiAgICAgaWYgKCF3cmFwcGVkX29iaikgewpAQCAtNDE0
Niw3ICs0MTQ2LDcgQEAgUEhQX01FVEhPRAogICAgIEd0a0FjY2VsR3JvdXAgKmFjY2VsX2dyb3Vw
ID0gTlVMTDsKIAlHT2JqZWN0ICp3cmFwcGVkX29iajsKIAotICAgIGlmIChwaHBnX2d0eXBlX2Zy
b21fenZhbCh0aGlzX3B0cikgIT0gR1RLX1RZUEVfSU1BR0VfTUVOVV9JVEVNKSB7CisgICAgaWYg
KHBocGdfZ3R5cGVfZnJvbV96dmFsKHRoaXNfcHRyIFRTUk1MU19DQykgIT0gR1RLX1RZUEVfSU1B
R0VfTUVOVV9JVEVNKSB7CiAgICAgICAgIFBIUEdfVEhST1dfRVhDRVBUSU9OKHBocGdfY29uc3Ry
dWN0X2V4Y2VwdGlvbiwgIlN1YmNsYXNzaW5nIEd0a0ltYWdlTWVudUl0ZW0gcmVxdWlyZXMgbW9y
ZSB0aGFuIHlvdSBrbm93Iik7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC00MTk1LDEwICs0
MTk1LDEwIEBAIFBIUF9NRVRIT0QKICAgICB9CiAKICAgICBpZiAodGV4dCkgewotICAgICAgICB3
cmFwcGVkX29iaiA9IChHT2JqZWN0ICopZ19vYmplY3RfbmV3KHBocGdfZ3R5cGVfZnJvbV96dmFs
KHRoaXNfcHRyKSwgImxhYmVsIiwgdGV4dCwKKyAgICAgICAgd3JhcHBlZF9vYmogPSAoR09iamVj
dCAqKWdfb2JqZWN0X25ldyhwaHBnX2d0eXBlX2Zyb21fenZhbCh0aGlzX3B0ciBUU1JNTFNfQ0Mp
LCAibGFiZWwiLCB0ZXh0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICJ1c2UtdW5kZXJsaW5lIiwgdXNlX3VuZGVybGluZSwgTlVMTCk7CiAgICAgfSBlbHNl
IHsKLSAgICAgICAgd3JhcHBlZF9vYmogPSAoR09iamVjdCAqKWdfb2JqZWN0X25ldyhwaHBnX2d0
eXBlX2Zyb21fenZhbCh0aGlzX3B0ciksIE5VTEwpOworICAgICAgICB3cmFwcGVkX29iaiA9IChH
T2JqZWN0ICopZ19vYmplY3RfbmV3KHBocGdfZ3R5cGVfZnJvbV96dmFsKHRoaXNfcHRyIFRTUk1M
U19DQyksIE5VTEwpOwogICAgIH0KIAogICAgIGlmIChmcmVlX3RleHQpIGdfZnJlZSh0ZXh0KTsK
QEAgLTQzMDMsNyArNDMwMyw3IEBAIFBIUF9NRVRIT0QoR3RrTGlzdEl0ZW0sIF9fY29uc3RydWN0
KQogICAgICAgICB3cmFwcGVkX29iaiA9IChHT2JqZWN0ICopIGd0a19saXN0X2l0ZW1fbmV3X3dp
dGhfbGFiZWwobGFiZWwpOwogICAgICAgICBpZiAoZnJlZV9sYWJlbCkgZ19mcmVlKGxhYmVsKTsK
ICAgICB9IGVsc2UgewotICAgICAgICB3cmFwcGVkX29iaiA9IChHT2JqZWN0ICopIGdfb2JqZWN0
X25ld3YocGhwZ19ndHlwZV9mcm9tX3p2YWwodGhpc19wdHIpLCAwLCBOVUxMKTsKKyAgICAgICAg
d3JhcHBlZF9vYmogPSAoR09iamVjdCAqKSBnX29iamVjdF9uZXd2KHBocGdfZ3R5cGVfZnJvbV96
dmFsKHRoaXNfcHRyIFRTUk1MU19DQyksIDAsIE5VTEwpOwogICAgIH0KIAogICAgIGlmICghd3Jh
cHBlZF9vYmopIHsKQEAgLTQ1MDMsNyArNDUwMyw3IEBAIFBIUF9NRVRIT0QKICAgICB6ZW5kX2Jv
b2wgZnJlZV9tZXNzYWdlOwogICAgIEdPYmplY3QgKndyYXBwZWRfb2JqOwogCi0gICAgaWYgKHBo
cGdfZ3R5cGVfZnJvbV96dmFsKHRoaXNfcHRyKSAhPSBHVEtfVFlQRV9NRVNTQUdFX0RJQUxPRykg
eworICAgIGlmIChwaHBnX2d0eXBlX2Zyb21fenZhbCh0aGlzX3B0ciBUU1JNTFNfQ0MpICE9IEdU
S19UWVBFX01FU1NBR0VfRElBTE9HKSB7CiAgICAgICAgIFBIUEdfVEhST1dfRVhDRVBUSU9OKHBo
cGdfY29uc3RydWN0X2V4Y2VwdGlvbiwgIlN1YmNsYXNzaW5nIEd0a01lc3NhZ2VEaWFsb2cgcmVx
dWlyZXMgbW9yZSB0aGFuIHlvdSBrbm93Iik7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC00
NTY4LDcgKzQ1NjgsNyBAQCBQSFBfTUVUSE9ECiAgICAgICAgIFBIUEdfVEhST1dfQ09OU1RSVUNU
X0VYQ0VQVElPTihHdGtNZW51SXRlbSk7CiAgICAgfQogCi0gICAgd3JhcHBlZF9vYmogPSAoR09i
amVjdCAqKWdfb2JqZWN0X25ldyhwaHBnX2d0eXBlX2Zyb21fenZhbCh0aGlzX3B0ciksIE5VTEwp
OworICAgIHdyYXBwZWRfb2JqID0gKEdPYmplY3QgKilnX29iamVjdF9uZXcocGhwZ19ndHlwZV9m
cm9tX3p2YWwodGhpc19wdHIgVFNSTUxTX0NDKSwgTlVMTCk7CiAgICAgaWYgKHRleHQpIHsKICAg
ICAgICAgR3RrV2lkZ2V0ICphY2NlbF9sYWJlbDsKICAgICAgICAgYWNjZWxfbGFiZWwgPSBnX29i
amVjdF9uZXcoR1RLX1RZUEVfQUNDRUxfTEFCRUwsIE5VTEwpOwpAQCAtNDY3OCw3ICs0Njc4LDcg
QEAgUEhQX01FVEhPRAogICAgIGlmICghcGhwX2d0a19wYXJzZV9hcmdzKFpFTkRfTlVNX0FSR1Mo
KSwgIml8TyIsICZzb2NrZXRfaWQsICZkaXNwbGF5KSkKICAgICAgICAgUEhQR19USFJPV19DT05T
VFJVQ1RfRVhDRVBUSU9OKEd0a1BsdWcpOwogCi0gICAgd3JhcHBlZF9vYmogPSBnX29iamVjdF9u
ZXcocGhwZ19ndHlwZV9mcm9tX3p2YWwodGhpc19wdHIpLCBOVUxMKTsKKyAgICB3cmFwcGVkX29i
aiA9IGdfb2JqZWN0X25ldyhwaHBnX2d0eXBlX2Zyb21fenZhbCh0aGlzX3B0ciBUU1JNTFNfQ0Mp
LCBOVUxMKTsKIAogICAgIGlmICghd3JhcHBlZF9vYmopIHsKICAgICAgICAgUEhQR19USFJPV19D
T05TVFJVQ1RfRVhDRVBUSU9OKEd0a1BsdWcpOwpAQCAtNDc1MSw5ICs0NzUxLDkgQEAgUEhQX01F
VEhPRAogICAgIH0KIAogICAgIGlmIChhZGp1c3RtZW50KSB7Ci0gICAgICAgIHdyYXBwZWRfb2Jq
ID0gZ19vYmplY3RfbmV3KHBocGdfZ3R5cGVfZnJvbV96dmFsKHRoaXNfcHRyKSwgImFkanVzdG1l
bnQiLCBhZGp1c3RtZW50LCBOVUxMKTsKKyAgICAgICAgd3JhcHBlZF9vYmogPSBnX29iamVjdF9u
ZXcocGhwZ19ndHlwZV9mcm9tX3p2YWwodGhpc19wdHIgVFNSTUxTX0NDKSwgImFkanVzdG1lbnQi
LCBhZGp1c3RtZW50LCBOVUxMKTsKICAgICB9IGVsc2UgewotICAgICAgICB3cmFwcGVkX29iaiA9
IGdfb2JqZWN0X25ldyhwaHBnX2d0eXBlX2Zyb21fenZhbCh0aGlzX3B0ciksIE5VTEwpOworICAg
ICAgICB3cmFwcGVkX29iaiA9IGdfb2JqZWN0X25ldyhwaHBnX2d0eXBlX2Zyb21fenZhbCh0aGlz
X3B0ciBUU1JNTFNfQ0MpLCBOVUxMKTsKICAgICB9CiAKIAlpZiAoIXdyYXBwZWRfb2JqKSB7CkBA
IC00ODI5LDcgKzQ4MjksNyBAQCBQSFBfTUVUSE9ECiAgICAgemVuZF9ib29sIGZyZWVfbGFiZWws
IHVzZV91bmRlcmxpbmUgPSAxOwogICAgIEd0a1JhZGlvQnV0dG9uICpncm91cCA9IE5VTEw7CiAg
ICAgR09iamVjdCAqd3JhcHBlZF9vYmo7Ci0gICAgR1R5cGUgZ3R5cGUgPSBwaHBnX2d0eXBlX2Zy
b21fenZhbCh0aGlzX3B0cik7CisgICAgR1R5cGUgZ3R5cGUgPSBwaHBnX2d0eXBlX2Zyb21fenZh
bCh0aGlzX3B0ciBUU1JNTFNfQ0MpOwogCiAgICAgaWYgKCFwaHBfZ3RrX3BhcnNlX2FyZ3MoWkVO
RF9OVU1fQVJHUygpLCAifE51YiIsICZwaHBfZ3JvdXAsIGd0a3JhZGlvYnV0dG9uX2NlLCAmbGFi
ZWwsICZmcmVlX2xhYmVsLCAmdXNlX3VuZGVybGluZSkpIHsKICAgICAgICAgUEhQR19USFJPV19D
T05TVFJVQ1RfRVhDRVBUSU9OKEd0a1JhZGlvQnV0dG9uKTsKQEAgLTQ5MzcsNyArNDkzNyw3IEBA
IFBIUF9NRVRIT0QKICAgICB6ZW5kX2Jvb2wgZnJlZV9sYWJlbCwgdXNlX3VuZGVybGluZSA9IDE7
CiAgICAgR3RrUmFkaW9NZW51SXRlbSAqZ3JvdXAgPSBOVUxMOwogICAgIEdPYmplY3QgKndyYXBw
ZWRfb2JqOwotICAgIEdUeXBlIGd0eXBlID0gcGhwZ19ndHlwZV9mcm9tX3p2YWwodGhpc19wdHIp
OworICAgIEdUeXBlIGd0eXBlID0gcGhwZ19ndHlwZV9mcm9tX3p2YWwodGhpc19wdHIgVFNSTUxT
X0NDKTsKIAogICAgIGlmICghcGhwX2d0a19wYXJzZV9hcmdzKFpFTkRfTlVNX0FSR1MoKSwgInxO
dWIiLCAmcGhwX2dyb3VwLCBndGtyYWRpb21lbnVpdGVtX2NlLCAmbGFiZWwsICZmcmVlX2xhYmVs
LCAmdXNlX3VuZGVybGluZSkpIHsKICAgICAgICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBU
SU9OKEd0a1JhZGlvTWVudUl0ZW0pOwpAQCAtNTA4MCw3ICs1MDgwLDcgQEAgUEhQX01FVEhPRAog
ICAgIGNoYXIgKnN0b2NrX2lkID0gTlVMTDsKICAgICB6ZW5kX2Jvb2wgZnJlZV9zdG9ja19pZDsK
ICAgICBHT2JqZWN0ICp3cmFwcGVkX29iajsKLSAgICBHVHlwZSBndHlwZSA9IHBocGdfZ3R5cGVf
ZnJvbV96dmFsKHRoaXNfcHRyKTsKKyAgICBHVHlwZSBndHlwZSA9IHBocGdfZ3R5cGVfZnJvbV96
dmFsKHRoaXNfcHRyIFRTUk1MU19DQyk7CiAKICAgICBpZiAoIXBocF9ndGtfcGFyc2VfYXJncyha
RU5EX05VTV9BUkdTKCksICJ8TnUiLCAmcGhwX2dyb3VwLCBndGtyYWRpb3Rvb2xidXR0b25fY2Us
ICZzdG9ja19pZCwgJmZyZWVfc3RvY2tfaWQpKSB7CiAgICAgICAgIFBIUEdfVEhST1dfQ09OU1RS
VUNUX0VYQ0VQVElPTihHdGtSYWRpb1Rvb2xCdXR0b24pOwpAQCAtNTQ2NCw3ICs1NDY0LDcgQEAg
UEhQX01FVEhPRAogICAgIHplbmRfYm9vbCBmcmVlX3RleHQgPSBGQUxTRSwgdXNlX3VuZGVybGlu
ZSA9IDE7CiAKICAgICBpZiAoIXBocF9ndGtfcGFyc2VfYXJncyhaRU5EX05VTV9BUkdTKCksICJ8
dWIiLCAmdGV4dCwgJmZyZWVfdGV4dCwgJnVzZV91bmRlcmxpbmUpKSB7Ci0gICAgICAgIFBIUEdf
VEhST1dfQ09OU1RSVUNUX0VYQ0VQVElPTihHdGtUb2dnbGVCdXR0b24gVFNSTUxTX0NDKTsKKyAg
ICAgICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBUSU9OKEd0a1RvZ2dsZUJ1dHRvbik7CiAg
ICAgfQogCiAgICAgaWYgKHRleHQpIHsKQEAgLTU0NzcsNyArNTQ3Nyw3IEBAIFBIUF9NRVRIT0QK
ICAgICBpZiAoZnJlZV90ZXh0KSBnX2ZyZWUodGV4dCk7CiAKICAgICBpZiAoIXdyYXBwZWRfb2Jq
KSB7Ci0gICAgICAgIFBIUEdfVEhST1dfQ09OU1RSVUNUX0VYQ0VQVElPTihHdGtUb2dnbGVCdXR0
b24gVFNSTUxTX0NDKTsKKyAgICAgICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBUSU9OKEd0
a1RvZ2dsZUJ1dHRvbik7CiAgICAgfQogCiAgICAgcGhwZ19nb2JqZWN0X3NldF93cmFwcGVyKHRo
aXNfcHRyLCB3cmFwcGVkX29iaiBUU1JNTFNfQ0MpOwpkaWZmIC0tZ2l0IGEvZXh0L2d0aysvZ3Rr
dHJlZXZpZXcub3ZlcnJpZGVzIGIvZXh0L2d0aysvZ3RrdHJlZXZpZXcub3ZlcnJpZGVzCmluZGV4
IGVkMTc0NDcuLjU2NDc0ZGUgMTAwNjQ0Ci0tLSBhL2V4dC9ndGsrL2d0a3RyZWV2aWV3Lm92ZXJy
aWRlcworKysgYi9leHQvZ3RrKy9ndGt0cmVldmlldy5vdmVycmlkZXMKQEAgLTI4MywyMCArMjgz
LDIwIEBAIFBIUF9NRVRIT0QKICAgICAgICAgY29sdW1uX3R5cGVzID0gZW1hbGxvYyhhcmdjICog
c2l6ZW9mKEdUeXBlKSk7CiAKICAgICAgICAgZm9yIChpID0gMDsgaSA8IGFyZ2M7IGkrKykgewot
ICAgICAgICAgICAgY29sdW1uX3R5cGVzW2ldID0gcGhwZ19ndHlwZV9mcm9tX3p2YWwoKmFyZ3Nb
aV0pOworICAgICAgICAgICAgY29sdW1uX3R5cGVzW2ldID0gcGhwZ19ndHlwZV9mcm9tX3p2YWwo
KmFyZ3NbaV0gVFNSTUxTX0NDKTsKICAgICAgICAgICAgIGlmIChjb2x1bW5fdHlwZXNbaV0gPT0g
MCkgewogICAgICAgICAgICAgICAgIGVmcmVlKGNvbHVtbl90eXBlcyk7CiAgICAgICAgICAgICAg
ICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBUSU9OKEd0a0xpc3RTdG9yZSk7CiAgICAgICAg
ICAgICB9CiAgICAgICAgIH0KIAotICAgICAgICB3cmFwcGVkX29iaiA9IGdfb2JqZWN0X25ld3Yo
cGhwZ19ndHlwZV9mcm9tX3p2YWwodGhpc19wdHIpLCAwLCBOVUxMKTsKKyAgICAgICAgd3JhcHBl
ZF9vYmogPSBnX29iamVjdF9uZXd2KHBocGdfZ3R5cGVfZnJvbV96dmFsKHRoaXNfcHRyIFRTUk1M
U19DQyksIDAsIE5VTEwpOwogICAgICAgICBndGtfbGlzdF9zdG9yZV9zZXRfY29sdW1uX3R5cGVz
KEdUS19MSVNUX1NUT1JFKHdyYXBwZWRfb2JqKSwgYXJnYywgY29sdW1uX3R5cGVzKTsKIAogICAg
ICAgICBlZnJlZShjb2x1bW5fdHlwZXMpOwogICAgICAgICBlZnJlZShhcmdzKTsKICAgICB9IGVs
c2UgewotICAgICAgICB3cmFwcGVkX29iaiA9IGdfb2JqZWN0X25ldyhwaHBnX2d0eXBlX2Zyb21f
enZhbCh0aGlzX3B0ciksIE5VTEwpOworICAgICAgICB3cmFwcGVkX29iaiA9IGdfb2JqZWN0X25l
dyhwaHBnX2d0eXBlX2Zyb21fenZhbCh0aGlzX3B0ciBUU1JNTFNfQ0MpLCBOVUxMKTsKICAgICB9
CiAKICAgICBpZiAoIXdyYXBwZWRfb2JqKSB7CkBAIC0zMzIsNyArMzMyLDcgQEAgUEhQX01FVEhP
RAogICAgICAgICAgemVuZF9oYXNoX2dldF9jdXJyZW50X2RhdGEoWl9BUlJWQUxfUChwaHBfdHlw
ZXMpLCAodm9pZCoqKSZpdGVtKSA9PSBTVUNDRVNTOwogICAgICAgICAgemVuZF9oYXNoX21vdmVf
Zm9yd2FyZChaX0FSUlZBTF9QKHBocF90eXBlcykpLCBpKyspIHsKIAotICAgICAgICBjb2x1bW5f
dHlwZXNbaV0gPSBwaHBnX2d0eXBlX2Zyb21fenZhbCgqaXRlbSk7CisgICAgICAgIGNvbHVtbl90
eXBlc1tpXSA9IHBocGdfZ3R5cGVfZnJvbV96dmFsKCppdGVtIFRTUk1MU19DQyk7CiAgICAgICAg
IGlmIChjb2x1bW5fdHlwZXNbaV0gPT0gMCkgewogICAgICAgICAgICAgZWZyZWUoY29sdW1uX3R5
cGVzKTsKICAgICAgICAgICAgIHBocF9lcnJvcihFX1dBUk5JTkcsICJjb3VsZCBub3Qgc2V0IGNv
bHVtbiB0eXBlcyBmb3IgR3RrTGlzdFN0b3JlIik7CkBAIC03NzcsNyArNzc3LDcgQEAgUEhQX01F
VEhPRAogICAgICAgICAgICAgY29sdW1uX3R5cGVzW2ldID0gcGhwZ19ndHlwZV9mcm9tX3p2YWwo
KmFyZ3NbaV0gVFNSTUxTX0NDKTsKICAgICAgICAgICAgIGlmIChjb2x1bW5fdHlwZXNbaV0gPT0g
MCkgewogICAgICAgICAgICAgICAgIGVmcmVlKGNvbHVtbl90eXBlcyk7Ci0gICAgICAgICAgICAg
ICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBUSU9OKEd0a1RyZWVTdG9yZSBUU1JNTFNfQ0Mp
OworICAgICAgICAgICAgICAgIFBIUEdfVEhST1dfQ09OU1RSVUNUX0VYQ0VQVElPTihHdGtUcmVl
U3RvcmUpOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAKQEAgLTE1OTgsNyArMTU5OCw3IEBA
IFBIUF9NRVRIT0QKICAgICB9CiAKICAgICBpZiAoIXdyYXBwZWRfb2JqKSB7Ci0gICAgICAgIFBI
UEdfVEhST1dfQ09OU1RSVUNUX0VYQ0VQVElPTihHdGtUcmVlTW9kZWxGaWx0ZXIgVFNSTUxTX0ND
KTsKKyAgICAgICAgUEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBUSU9OKEd0a1RyZWVNb2RlbEZp
bHRlcik7CiAgICAgfQogCiAgICAgcGhwZ19nb2JqZWN0X3NldF93cmFwcGVyKHRoaXNfcHRyLCB3
cmFwcGVkX29iaiBUU1JNTFNfQ0MpOwpkaWZmIC0tZ2l0IGEvZXh0L2d0aysvcGhwX2d0aytfdHlw
ZXMuYyBiL2V4dC9ndGsrL3BocF9ndGsrX3R5cGVzLmMKaW5kZXggYjEyMzkzMS4uODcxMTk0NyAx
MDA2NDQKLS0tIGEvZXh0L2d0aysvcGhwX2d0aytfdHlwZXMuYworKysgYi9leHQvZ3RrKy9waHBf
Z3RrK190eXBlcy5jCkBAIC0xNDE0LDcgKzE0MTQsNyBAQCB6dmFsICpwaHBfZ2RrX2V2ZW50X25l
dyhHZGtFdmVudCAqZXZlbnQpCiAJCWNhc2UgR0RLX0VOVEVSX05PVElGWToKIAkJY2FzZSBHREtf
TEVBVkVfTk9USUZZOgogCQkJaWYgKGV2ZW50LT5jcm9zc2luZy5zdWJ3aW5kb3cpIHsKLQkJCQl2
YWx1ZSA9IHBocF9nZGtfd2luZG93X25ldyhldmVudC0+Y3Jvc3Npbmcuc3Vid2luZG93IFRTUk1M
U19DQykpOworCQkJCXZhbHVlID0gcGhwX2dka193aW5kb3dfbmV3KGV2ZW50LT5jcm9zc2luZy5z
dWJ3aW5kb3cgVFNSTUxTX0NDKTsKIAkJCQlhZGRfcHJvcGVydHlfenZhbChyZXN1bHQsICJzdWJ3
aW5kb3ciLCB2YWx1ZSk7CiAJCQl9IGVsc2UKIAkJCQlhZGRfcHJvcGVydHlfbnVsbChyZXN1bHQs
ICJzdWJ3aW5kb3ciKTsKQEAgLTIwNTUsMTAgKzIwNTUsMTAgQEAgc3RhdGljIHZvaWQgZ2RrX3dp
bmRvd19nZXRfcHJvcGVydHkoenZhbCAqcmV0dXJuX3ZhbHVlLCB6dmFsICpvYmplY3QsIGNoYXIg
KnByb3AKIAkJfSBlbHNlIGlmICghc3RyY21wKHByb3BfbmFtZSwgInBhcmVudCIpKSB7CiAJCQlH
ZGtXaW5kb3cgKnBhcmVudCA9IGdka193aW5kb3dfZ2V0X3BhcmVudCh3aW4pOwogCQkJaWYgKHBh
cmVudCkKLQkJCQkqcmV0dXJuX3ZhbHVlID0gKnBocF9nZGtfd2luZG93X25ldyhwYXJlbnQgVFNS
TUxTX0NDKSk7CisJCQkJKnJldHVybl92YWx1ZSA9ICpwaHBfZ2RrX3dpbmRvd19uZXcocGFyZW50
IFRTUk1MU19DQyk7CiAJCQlyZXR1cm47CiAJCX0gZWxzZSBpZiAoIXN0cmNtcChwcm9wX25hbWUs
ICJ0b3BsZXZlbCIpKSB7Ci0JCQkqcmV0dXJuX3ZhbHVlID0gKnBocF9nZGtfd2luZG93X25ldyhn
ZGtfd2luZG93X2dldF90b3BsZXZlbCh3aW4pIFRTUk1MU19DQykpOworCQkJKnJldHVybl92YWx1
ZSA9ICpwaHBfZ2RrX3dpbmRvd19uZXcoZ2RrX3dpbmRvd19nZXRfdG9wbGV2ZWwod2luKSBUU1JN
TFNfQ0MpOwogCQkJcmV0dXJuOwogCQl9IGVsc2UgaWYgKCFzdHJjbXAocHJvcF9uYW1lLCAiY2hp
bGRyZW4iKSkgewogCQkJR0xpc3QgKmNoaWxkcmVuLCAqdG1wOwpAQCAtMjA2Niw3ICsyMDY2LDcg
QEAgc3RhdGljIHZvaWQgZ2RrX3dpbmRvd19nZXRfcHJvcGVydHkoenZhbCAqcmV0dXJuX3ZhbHVl
LCB6dmFsICpvYmplY3QsIGNoYXIgKnByb3AKIAkJCWNoaWxkcmVuID0gZ2RrX3dpbmRvd19nZXRf
Y2hpbGRyZW4od2luKTsKIAkJCWFycmF5X2luaXQocmV0dXJuX3ZhbHVlKTsKIAkJCWZvciAodG1w
ID0gY2hpbGRyZW47IHRtcDsgdG1wID0gdG1wLT5uZXh0KSB7Ci0JCQkJY2hpbGQgPSBwaHBfZ2Rr
X3dpbmRvd19uZXcodG1wLT5kYXRhIFRTUk1MU19DQykpOworCQkJCWNoaWxkID0gcGhwX2dka193
aW5kb3dfbmV3KHRtcC0+ZGF0YSBUU1JNTFNfQ0MpOwogCQkJCXplbmRfaGFzaF9uZXh0X2luZGV4
X2luc2VydChaX0FSUlZBTF9QKHJldHVybl92YWx1ZSksICZjaGlsZCwgc2l6ZW9mKHp2YWwgKiks
IE5VTEwpOwogCQkJfQogCQkJZ19saXN0X2ZyZWUoY2hpbGRyZW4pOwpAQCAtMjkzMywxMSArMjkz
MywxMSBAQCBzdGF0aWMgdm9pZCBnZGtfZHJhZ19jb250ZXh0X2dldF9wcm9wZXJ0eSh6dmFsICpy
ZXR1cm5fdmFsdWUsIHp2YWwgKm9iamVjdCwgY2hhcgogCQlSRVRVUk5fQk9PTChjb250ZXh0LT5p
c19zb3VyY2UpOwogCX0gZWxzZSBpZiAoIXN0cmNtcChwcm9wX25hbWUsICJzb3VyY2Vfd2luZG93
IikpIHsKIAkJaWYgKGNvbnRleHQtPnNvdXJjZV93aW5kb3cpCi0JCQkqcmV0dXJuX3ZhbHVlID0g
KnBocF9nZGtfd2luZG93X25ldyhjb250ZXh0LT5zb3VyY2Vfd2luZG93IFRTUk1MU19DQykpOwor
CQkJKnJldHVybl92YWx1ZSA9ICpwaHBfZ2RrX3dpbmRvd19uZXcoY29udGV4dC0+c291cmNlX3dp
bmRvdyBUU1JNTFNfQ0MpOwogCQlyZXR1cm47CiAJfSBlbHNlIGlmICghc3RyY21wKHByb3BfbmFt
ZSwgImRlc3Rfd2luZG93IikpIHsKIAkJaWYgKGNvbnRleHQtPmRlc3Rfd2luZG93KQotCQkJKnJl
dHVybl92YWx1ZSA9ICpwaHBfZ2RrX3dpbmRvd19uZXcoY29udGV4dC0+ZGVzdF93aW5kb3cgVFNS
TUxTX0NDKSk7CisJCQkqcmV0dXJuX3ZhbHVlID0gKnBocF9nZGtfd2luZG93X25ldyhjb250ZXh0
LT5kZXN0X3dpbmRvdyBUU1JNTFNfQ0MpOwogCQlyZXR1cm47CiAJfSBlbHNlIGlmICghc3RyY21w
KHByb3BfbmFtZSwgInRhcmdldHMiKSkgewogCQlHTGlzdCAqdG1wOwpkaWZmIC0tZ2l0IGEvZXh0
L3NjaW50aWxsYS9zY2ludGlsbGEuaW4gYi9leHQvc2NpbnRpbGxhL3NjaW50aWxsYS5pbgppbmRl
eCA2MWJjMmY4Li4yMTM3MWEwIDEwMDY0NAotLS0gYS9leHQvc2NpbnRpbGxhL3NjaW50aWxsYS5p
bgorKysgYi9leHQvc2NpbnRpbGxhL3NjaW50aWxsYS5pbgpAQCAtNDE4LDcgKzQxOCw3IEBAIHN0
YXRpYyBQSFBfTUVUSE9EKFNjaW50aWxsYSwgX19jb25zdHJ1Y3QpIHsKIAogCUdPYmplY3QgKndy
YXBwZWRfb2JqOwogICAKLQlHVHlwZSBndHlwZSA9IHBocGdfZ3R5cGVfZnJvbV96dmFsKHRoaXNf
cHRyKTsgCisJR1R5cGUgZ3R5cGUgPSBwaHBnX2d0eXBlX2Zyb21fenZhbCh0aGlzX3B0ciBUU1JN
TFNfQ0MpOyAKIAlpZighcGhwX2d0a19wYXJzZV9hcmdzKFpFTkRfTlVNX0FSR1MoKSwgIiIpKSB7
CiAgICAgcGhwX2Vycm9yKEVfRVJST1IsICJwaHAtZ3RrLXNjaW50aWxsYTogV3JvbmcgYXJncyIp
OyAgCiAgICAgICAgIC8vUEhQR19USFJPV19DT05TVFJVQ1RfRVhDRVBUSU9OKFNjaW50aWxsYSk7
CmRpZmYgLS1naXQgYS9nZW5lcmF0b3IvdGVtcGxhdGVzLnBocCBiL2dlbmVyYXRvci90ZW1wbGF0
ZXMucGhwCmluZGV4IGEwOTgwODYuLjBiZWMxMGMgMTAwNjQ0Ci0tLSBhL2dlbmVyYXRvci90ZW1w
bGF0ZXMucGhwCisrKyBiL2dlbmVyYXRvci90ZW1wbGF0ZXMucGhwCkBAIC0xNTMsOSArMTUzLDkg
QEAgc3RhdGljIFBIUF9NRVRIT0QoJShjbGFzcyksICUobmFtZSkpCiAgICAgR1BhcmFtZXRlciBw
YXJhbXNbJShuX3BhcmFtcyldOwogCXp2YWwgKnBocF9hcmdzWyUobl9hcmdzKV0gPSB7IE5VTEws
IH07CiAJY2hhciAqcHJvcF9uYW1lc1tdID0geyAlKHByb3BzKSBOVUxMIH07Ci0JR1R5cGUgZ3R5
cGUgPSBwaHBnX2d0eXBlX2Zyb21fenZhbCh0aGlzX3B0cik7CiAgICAgR09iamVjdCAqd3JhcHBl
ZF9vYmo7CiAgICAgZ3VpbnQgaSwgbl9wYXJhbXM7CisJR1R5cGUgZ3R5cGUgPSBwaHBnX2d0eXBl
X2Zyb21fenZhbCh0aGlzX3B0ciBUU1JNTFNfQ0MpOwogCiAgICAgaWYgKCFwaHBfZ3RrX3BhcnNl
X2FyZ3MoWkVORF9OVU1fQVJHUygpLCBcIiUoc3BlY3MpXCIlKHBhcnNlX2xpc3QpKSkgewogICAg
ICAgICBQSFBHX1RIUk9XX0NPTlNUUlVDVF9FWENFUFRJT04oJShjbGFzcykpOwpkaWZmIC0tZ2l0
IGEvbWFpbi9waHBnX2dvYmplY3QuYyBiL21haW4vcGhwZ19nb2JqZWN0LmMKaW5kZXggM2UxMWI2
My4uM2VkMmJlMSAxMDA2NDQKLS0tIGEvbWFpbi9waHBnX2dvYmplY3QuYworKysgYi9tYWluL3Bo
cGdfZ29iamVjdC5jCkBAIC0yNjEsMTEgKzI2MSwxMSBAQCB6ZW5kX2Jvb2wgcGhwZ19nb2JqZWN0
X2NvbnN0cnVjdCh6dmFsICp0aGlzX3B0ciwgR1R5cGUgb2JqZWN0X3R5cGUsIHp2YWwgKnByb3Bz
CiAKICAgICBpZiAoR19UWVBFX0lTX0FCU1RSQUNUKG9iamVjdF90eXBlKSkgewogICAgICAgICBz
bnByaW50ZihidWYsIDEyOCwgIkNhbm5vdCBpbnN0YW50aWF0ZSBhYnN0cmFjdCBjbGFzcyAlcyIs
IGdfdHlwZV9uYW1lKG9iamVjdF90eXBlKSk7Ci0gICAgICAgIFBIUEdfVEhST1dfRVhDRVBUSU9O
X1dJVEhfUkVUVVJOKHBocGdfY29uc3RydWN0X2V4Y2VwdGlvbiwgYnVmLCAwIFRTUk1MU19DQyk7
CisgICAgICAgIFBIUEdfVEhST1dfRVhDRVBUSU9OX1dJVEhfUkVUVVJOKHBocGdfY29uc3RydWN0
X2V4Y2VwdGlvbiwgYnVmLCAwKTsKICAgICB9CiAKICAgICBpZiAoKGtsYXNzID0gZ190eXBlX2Ns
YXNzX3JlZihvYmplY3RfdHlwZSkpID09IE5VTEwpIHsKLSAgICAgICAgUEhQR19USFJPV19FWENF
UFRJT05fV0lUSF9SRVRVUk4ocGhwZ19jb25zdHJ1Y3RfZXhjZXB0aW9uLCAiQ291bGQgbm90IGdl
dCBhIHJlZmVyZW5jZSB0byB0eXBlIGNsYXNzIiwgMCBUU1JNTFNfQ0MpOworICAgICAgICBQSFBH
X1RIUk9XX0VYQ0VQVElPTl9XSVRIX1JFVFVSTihwaHBnX2NvbnN0cnVjdF9leGNlcHRpb24sICJD
b3VsZCBub3QgZ2V0IGEgcmVmZXJlbmNlIHRvIHR5cGUgY2xhc3MiLCAwKTsKICAgICB9CiAKICAg
ICBpZiAocHJvcHMpIHs=

--9095ca772eeebfad1d5937a5c3a9adfe19bdeac2--