java/1213: gcj should check for incorrect CLASSPATH

java/1213: gcj should check for incorrect CLASSPATH

[Tom Tromey]

>Number:         1213
>Category:       java
>Synopsis:       gcj should check for incorrect CLASSPATH
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    apbianco
>State:          feedback
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Dec 20 12:17:45 PST 2000
>Closed-Date:    
>Last-Modified:  Mon Oct 16 10:50:00 PDT 2000
>Originator:     Tom Tromey
>Release:        unknown-1.0
>Organization:
>Environment:

>Description:
gcj should check for an incorrect CLASSPATH.
We could do this by looking for a special
private symbol in a certain class, eg Object.
Godmar suggested this approach; apparently Kaffe
does this.
>How-To-Repeat:

>Fix:

>Release-Note:

>Audit-Trail:

Formerly PR gcj/165

State-Changed-From-To: open->feedback
State-Changed-By: apbianco
State-Changed-When: Mon Oct 16 10:44:14 2000
State-Changed-Why:
    I have a patch, which rather relies on gcj setting a special
    attribute "gnu.gcj.gcj-compiled" in Object.class and then
    checking for it when java.lang.Object is read. 
    
    The check isn't done if gcj is used to generate classfiles,
    unless the flag `-fforce-classes-archive-check' is used.

From: apbianco@cygnus.com
To: apbianco@cygnus.com, java-gnats@sourceware.cygnus.com, tromey@cygnus.com
Cc:  
Subject: Re: gcj/165
Date: 16 Oct 2000 17:44:14 -0000

 Synopsis: gcj should check for incorrect CLASSPATH
 
 State-Changed-From-To: open->feedback
 State-Changed-By: apbianco
 State-Changed-When: Mon Oct 16 10:44:14 2000
 State-Changed-Why:
     I have a patch, which rather relies on gcj setting a special
     attribute "gnu.gcj.gcj-compiled" in Object.class and then
     checking for it when java.lang.Object is read. 
     
     The check isn't done if gcj is used to generate classfiles,
     unless the flag `-fforce-classes-archive-check' is used.
 
 http://sources.redhat.com/cgi-bin/gnatsweb.pl?cmd=view&pr=165&database=java
>Unformatted:
----gnatsweb-attachment----
Content-Type: application/octet-stream; name="patch"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="patch"

MjAwMC0xMC0xNiAgQWxleGFuZHJlIFBldGl0LUJpYW5jbyAgPGFwYmlhbmNvQGN5Z251cy5jb20+
CgogICAgICAgICogamF2YS10cmVlLmggKGZsYWdfZm9yY2VfY2xhc3Nlc19hcmNoaXZlX2NoZWNr
KTogRGVjbGFyZWQgZXh0ZXJuLgogICAgICAgICogamNmLXBhcnNlLmMgKEhBTkRMRV9HQ0pDT01Q
SUxFRF9BVFRSSUJVVEUpOiBOZXcgbWFjcm8uCiAgICAgICAgKGpjZl9wYXJzZSk6IENoZWNrIGZv
ciB0aGUgcmlnaHQgY2xhc3NlcyBhcmNoaXZlIGlmIG5lY2Vzc2FyeS4KICAgICAgICAqIGpjZi1y
ZWFkZXIuYyAoZ2V0X2F0dHJpYnV0ZSk6IERlZmluZSBgTUFUQ0hfQVRUUklCVVRFJyBhbmQgdXNl
IGl0LgogICAgICAgIChqY2ZfcGFyc2VfZmllbGRzKTogRml4ZWQgaW5kZW50YXRpb24uCiAgICAg
ICAgKiBqY2Ytd3JpdGUuYyAoYXBwZW5kX2djal9hdHRyaWJ1dGUpOiBOZXcgZnVuY3Rpb24uCiAg
ICAgICAgKGdlbmVyYXRlX2NsYXNzZmlsZSk6IENvbXB1dGUgdGhlIGF0dHJpYnV0ZSBjb3VudCwg
aW52b2tlCiAgICAgICAgYGFwcGVuZF9nY2pfYXR0cmlidXRlJy4KICAgICAgICAqIGpjZi5oICh0
eXBlZGVmIHN0cnVjdCBKQ0YpOiBgc2Vlbl9pbl96aXAnIGFuZCBgamF2YV9zb3VyY2UnCiAgICAg
ICAgdHVybmVkIGludG8gYml0IGZpZWxkcy4gTmV3IGJpdCBmaWVsZCBgcmlnaHRfemlwLicKICAg
ICAgICAoSkNGX1pFUk8pOiBTZXQgYHJpZ2h0X3ppcCcgdG8gemVyby4KICAgICAgICAqIGxhbmct
b3B0aW9ucy5oICgtZmZvcmNlLWNsYXNzZXMtYXJjaGl2ZS1jaGVjayk6IEFkZGVkIGZsYWcuCiAg
ICAgICAgKiBsYW5nLmMgKGZsYWdfZm9yY2VfY2xhc3Nlc19hcmNoaXZlX2NoZWNrKTogTmV3IGZs
YWcuCiAgICAgICAgKGxhbmdfZl9vcHRpb25zKTogTmV3IGVudHJ5IGBmb3JjZS1jbGFzc2VzLWFy
Y2hpdmUtY2hlY2suJwoKSW5kZXg6IGphdmEtdHJlZS5oCj09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9j
dnMvZ2NjL2VnY3MvZ2NjL2phdmEvamF2YS10cmVlLmgsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEu
ODYKZGlmZiAtdSAtcCAtcjEuODYgamF2YS10cmVlLmgKLS0tIGphdmEtdHJlZS5oCTIwMDAvMTAv
MTMgMjE6MDY6NDUJMS44NgorKysgamF2YS10cmVlLmgJMjAwMC8xMC8xNiAxNzozNjowMApAQCAt
MTQ4LDYgKzE0OCwxMCBAQCBleHRlcm4gaW50IGZsYWdfam5pOwogCiBleHRlcm4gaW50IGZsYWdf
ZXh0cmFuZW91c19zZW1pY29sb247CiAKKy8qIFdoZW4gbm9uIHplcm8sIGFsd2F5cyBjaGVjayBm
b3IgYSBub24gZ2NqIGdlbmVyYXRlZCBjbGFzc2VzIGFyY2hpdmUuICAqLworCitleHRlcm4gaW50
IGZsYWdfZm9yY2VfY2xhc3Nlc19hcmNoaXZlX2NoZWNrOworCiAvKiBXaGVuIG5vbiB6ZXJvLCB3
ZSBlbWl0IHhyZWYgc3RyaW5ncy4gVmFsdWVzIG9mIHRoZSBmbGFnIGZvciB4cmVmCiAgICBiYWNr
ZW5kcyBhcmUgZGVmaW5lZCBpbiB4cmVmLmguICAqLwogCkluZGV4OiBqY2YtcGFyc2UuYwo9PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09ClJDUyBmaWxlOiAvY3ZzL2djYy9lZ2NzL2djYy9qYXZhL2pjZi1wYXJzZS5jLHYKcmV0
cmlldmluZyByZXZpc2lvbiAxLjU3CmRpZmYgLXUgLXAgLXIxLjU3IGpjZi1wYXJzZS5jCi0tLSBq
Y2YtcGFyc2UuYwkyMDAwLzEwLzAxIDE5OjE5OjI5CTEuNTcKKysrIGpjZi1wYXJzZS5jCTIwMDAv
MTAvMTYgMTc6MzY6MDUKQEAgLTIxMCw2ICsyMTAsMTIgQEAgc2V0X3NvdXJjZV9maWxlbmFtZSAo
amNmLCBpbmRleCkKICAgICB9CQkJCQkJCQkJICBcCiB9CiAKKyNkZWZpbmUgSEFORExFX0dDSkNP
TVBJTEVEX0FUVFJJQlVURSgpCQlcCit7IAkJCQkJCVwKKyAgaWYgKGN1cnJlbnRfY2xhc3MgPT0g
b2JqZWN0X3R5cGVfbm9kZSkJXAorICAgIGpjZi0+cmlnaHRfemlwID0gMTsJCQkJXAorfQorCiAj
aW5jbHVkZSAiamNmLXJlYWRlci5jIgogCiBzdGF0aWMgaW50IHl5ZGVidWc7CkBAIC02NDIsNyAr
NjQ4LDEzIEBAIGpjZl9wYXJzZSAoamNmKQogICBwdXNoX29ic3RhY2tzICgmcGVybWFuZW50X29i
c3RhY2ssICZwZXJtYW5lbnRfb2JzdGFjayk7CiAgIGxheW91dF9jbGFzcyAoY3VycmVudF9jbGFz
cyk7CiAgIGlmIChjdXJyZW50X2NsYXNzID09IG9iamVjdF90eXBlX25vZGUpCi0gICAgbGF5b3V0
X2NsYXNzX21ldGhvZHMgKG9iamVjdF90eXBlX25vZGUpOworICAgIHsKKyAgICAgIGxheW91dF9j
bGFzc19tZXRob2RzIChvYmplY3RfdHlwZV9ub2RlKTsKKyAgICAgIGlmICghamNmLT5yaWdodF96
aXAKKwkgIC8qIEltcGxlbWVudCAtZndhcm4td3JvbmctY2xhc3Nlc3ppcCAqLworCSAgJiYgKCFm
bGFnX2VtaXRfY2xhc3NfZmlsZXMgfHwgZmxhZ19mb3JjZV9jbGFzc2VzX2FyY2hpdmVfY2hlY2sp
KQorCWZhdGFsICgiSW5jb21wYXRpYmxlIGNsYXNzZXMgYXJjaGl2ZTogYCVzJyIsIGpjZi0+Zmls
ZW5hbWUpOworICAgIH0KICAgZWxzZQogICAgIGFsbF9jbGFzc19saXN0ID0gdHJlZV9jb25zIChO
VUxMX1RSRUUsIAogCQkJCVRZUEVfTkFNRSAoY3VycmVudF9jbGFzcyksIGFsbF9jbGFzc19saXN0
ICk7CkluZGV4OiBqY2YtcmVhZGVyLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9nY2MvZWdj
cy9nY2MvamF2YS9qY2YtcmVhZGVyLmMsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTIKZGlmZiAt
dSAtcCAtcjEuMTIgamNmLXJlYWRlci5jCi0tLSBqY2YtcmVhZGVyLmMJMjAwMC8wOC8wOCAwMzoz
MzozNgkxLjEyCisrKyBqY2YtcmVhZGVyLmMJMjAwMC8xMC8xNiAxNzozNjowNgpAQCAtMTEyLDYg
KzExMiw5IEBAIERFRlVOKGdldF9hdHRyaWJ1dGUsIChqY2YpLAogICBuYW1lX2xlbmd0aCA9IEpQ
T09MX1VURl9MRU5HVEggKGpjZiwgYXR0cmlidXRlX25hbWUpOwogICBuYW1lX2RhdGEgPSBKUE9P
TF9VVEZfREFUQSAoamNmLCBhdHRyaWJ1dGVfbmFtZSk7CiAKKyNkZWZpbmUgTUFUQ0hfQVRUUklC
VVRFKFMpIFwKKyAgKG5hbWVfbGVuZ3RoID09IHNpemVvZiAoUyktMSAmJiBtZW1jbXAgKG5hbWVf
ZGF0YSwgUywgc2l6ZW9mIChTKS0xKSA9PSAwKQorCiAjaWZkZWYgSUdOT1JFX0FUVFJJQlVURQog
ICAgaWYgKElHTk9SRV9BVFRSSUJVVEUgKGpjZiwgYXR0cmlidXRlX25hbWUsIGF0dHJpYnV0ZV9s
ZW5ndGgpKQogICAgICB7CkBAIC0xMjAsNyArMTIzLDcgQEAgREVGVU4oZ2V0X2F0dHJpYnV0ZSwg
KGpjZiksCiAgICBlbHNlCiAjZW5kaWYKICNpZmRlZiBIQU5ETEVfU09VUkNFRklMRQotICBpZiAo
bmFtZV9sZW5ndGggPT0gMTAgJiYgbWVtY21wIChuYW1lX2RhdGEsICJTb3VyY2VGaWxlIiwgMTAp
ID09IDApCisgIGlmIChNQVRDSF9BVFRSSUJVVEUgKCJTb3VyY2VGaWxlIikpCiAgICAgewogICAg
ICAgdWludDE2IHNvdXJjZWZpbGVfaW5kZXggPSBKQ0ZfcmVhZHUyIChqY2YpOwogICAgICAgSEFO
RExFX1NPVVJDRUZJTEUoc291cmNlZmlsZV9pbmRleCk7CkBAIC0xMjgsNyArMTMxLDcgQEAgREVG
VU4oZ2V0X2F0dHJpYnV0ZSwgKGpjZiksCiAgIGVsc2UKICNlbmRpZgogI2lmZGVmIEhBTkRMRV9D
T05TVEFOVFZBTFVFCi0gIGlmIChuYW1lX2xlbmd0aCA9PSAxMyAmJiBtZW1jbXAgKG5hbWVfZGF0
YSwgIkNvbnN0YW50VmFsdWUiLCAxMykgPT0gMCkKKyAgaWYgKE1BVENIX0FUVFJJQlVURSAoIkNv
bnN0YW50VmFsdWUiKSkKICAgICB7CiAgICAgICB1aW50MTYgY29uc3RhbnR2YWx1ZV9pbmRleCA9
IEpDRl9yZWFkdTIgKGpjZik7CiAgICAgICBpZiAoY29uc3RhbnR2YWx1ZV9pbmRleCA8PSAwIHx8
IGNvbnN0YW50dmFsdWVfaW5kZXggPj0gSlBPT0xfU0laRShqY2YpKQpAQCAtMTM4LDcgKzE0MSw3
IEBAIERFRlVOKGdldF9hdHRyaWJ1dGUsIChqY2YpLAogICBlbHNlCiAjZW5kaWYKICNpZmRlZiBI
QU5ETEVfQ09ERV9BVFRSSUJVVEUKLSAgaWYgKG5hbWVfbGVuZ3RoID09IDQgJiYgbWVtY21wIChu
YW1lX2RhdGEsICJDb2RlIiwgNCkgPT0gMCkKKyAgaWYgKE1BVENIX0FUVFJJQlVURSAoIkNvZGUi
KSkKICAgICB7CiAgICAgICB1aW50MTYgajsKICAgICAgIHVpbnQxNiBtYXhfc3RhY2sgQVRUUklC
VVRFX1VOVVNFRCA9IEpDRl9yZWFkdTIgKGpjZik7CkBAIC0xNjcsNyArMTcwLDcgQEAgREVGVU4o
Z2V0X2F0dHJpYnV0ZSwgKGpjZiksCiAgIGVsc2UKICNlbmRpZiAvKiBIQU5ETEVfQ09ERV9BVFRS
SUJVVEUgKi8KICNpZmRlZiBIQU5ETEVfRVhDRVBUSU9OU19BVFRSSUJVVEUKLSAgaWYgKG5hbWVf
bGVuZ3RoID09IDEwICYmIG1lbWNtcCAobmFtZV9kYXRhLCAiRXhjZXB0aW9ucyIsIDEwKSA9PSAw
KQorICBpZiAoTUFUQ0hfQVRUUklCVVRFICgiRXhjZXB0aW9ucyIpKQogICAgIHsKICAgICAgIHVp
bnQxNiBjb3VudCA9IEpDRl9yZWFkdTIgKGpjZik7CiAgICAgICBIQU5ETEVfRVhDRVBUSU9OU19B
VFRSSUJVVEUgKGNvdW50KTsKQEAgLTE3NSw3ICsxNzgsNyBAQCBERUZVTihnZXRfYXR0cmlidXRl
LCAoamNmKSwKICAgZWxzZQogI2VuZGlmCiAjaWZkZWYgSEFORExFX0xJTkVOVU1CRVJUQUJMRV9B
VFRSSUJVVEUKLSAgaWYgKG5hbWVfbGVuZ3RoID09IDE1ICYmIG1lbWNtcCAobmFtZV9kYXRhLCAi
TGluZU51bWJlclRhYmxlIiwgMTUpID09IDApCisgIGlmIChNQVRDSF9BVFRSSUJVVEUgKCJMaW5l
TnVtYmVyVGFibGUiKSkKICAgICB7CiAgICAgICB1aW50MTYgY291bnQgPSBKQ0ZfcmVhZHUyIChq
Y2YpOwogICAgICAgSEFORExFX0xJTkVOVU1CRVJUQUJMRV9BVFRSSUJVVEUgKGNvdW50KTsKQEAg
LTE4Myw3ICsxODYsNyBAQCBERUZVTihnZXRfYXR0cmlidXRlLCAoamNmKSwKICAgZWxzZQogI2Vu
ZGlmCiAjaWZkZWYgSEFORExFX0xPQ0FMVkFSSUFCTEVUQUJMRV9BVFRSSUJVVEUKLSAgaWYgKG5h
bWVfbGVuZ3RoID09IDE4ICYmIG1lbWNtcCAobmFtZV9kYXRhLCAiTG9jYWxWYXJpYWJsZVRhYmxl
IiwgMTgpID09IDApCisgIGlmIChNQVRDSF9BVFRSSUJVVEUgKCJMb2NhbFZhcmlhYmxlVGFibGUi
KSkKICAgICB7CiAgICAgICB1aW50MTYgY291bnQgPSBKQ0ZfcmVhZHUyIChqY2YpOwogICAgICAg
SEFORExFX0xPQ0FMVkFSSUFCTEVUQUJMRV9BVFRSSUJVVEUgKGNvdW50KTsKQEAgLTE5MSwxMyAr
MTk0LDIwIEBAIERFRlVOKGdldF9hdHRyaWJ1dGUsIChqY2YpLAogICBlbHNlCiAjZW5kaWYKICNp
ZmRlZiBIQU5ETEVfSU5ORVJDTEFTU0VTX0FUVFJJQlVURQotICBpZiAobmFtZV9sZW5ndGggPT0g
MTIgJiYgbWVtY21wIChuYW1lX2RhdGEsICJJbm5lckNsYXNzZXMiLCAxMikgPT0gMCkKKyAgaWYg
KE1BVENIX0FUVFJJQlVURSAoIklubmVyQ2xhc3NlcyIpKQogICAgIHsKICAgICAgIHVpbnQxNiBj
b3VudCA9IEpDRl9yZWFkdTIgKGpjZik7CiAgICAgICBIQU5ETEVfSU5ORVJDTEFTU0VTX0FUVFJJ
QlVURSAoY291bnQpOwogICAgIH0KICAgZWxzZQogI2VuZGlmCisjaWZkZWYgSEFORExFX0dDSkNP
TVBJTEVEX0FUVFJJQlVURQorICBpZiAoTUFUQ0hfQVRUUklCVVRFICgiZ251Lmdjai5nY2otY29t
cGlsZWQiKSkKKyAgICB7CisgICAgICBIQU5ETEVfR0NKQ09NUElMRURfQVRUUklCVVRFICgpOwor
ICAgIH0KKyAgZWxzZQorI2VuZGlmCiAgICAgewogI2lmZGVmIFBST0NFU1NfT1RIRVJfQVRUUklC
VVRFCiAgICAgICBQUk9DRVNTX09USEVSX0FUVFJJQlVURShqY2YsIGF0dHJpYnV0ZV9uYW1lLCBh
dHRyaWJ1dGVfbGVuZ3RoKTsKQEAgLTM0Nyw3ICszNTcsNyBAQCBERUZVTihqY2ZfcGFyc2VfZmll
bGRzLCAoamNmKSwKICAgICAgIHVpbnQxNiBhdHRyaWJ1dGVfY291bnQgPSBKQ0ZfcmVhZHUyIChq
Y2YpOwogI2lmZGVmIEhBTkRMRV9TVEFSVF9GSUVMRAogICAgICAgSEFORExFX1NUQVJUX0ZJRUxE
IChhY2Nlc3NfZmxhZ3MsIG5hbWVfaW5kZXgsIHNpZ25hdHVyZV9pbmRleCwKLQkJICAgIGF0dHJp
YnV0ZV9jb3VudCk7CisJCQkgIGF0dHJpYnV0ZV9jb3VudCk7CiAjZW5kaWYKICAgICAgIGZvciAo
aiA9IDA7IGogPCBhdHRyaWJ1dGVfY291bnQ7IGorKykKIAl7CkluZGV4OiBqY2Ytd3JpdGUuYwo9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL2djYy9lZ2NzL2djYy9qYXZhL2pjZi13cml0ZS5jLHYK
cmV0cmlldmluZyByZXZpc2lvbiAxLjY5CmRpZmYgLXUgLXAgLXIxLjY5IGpjZi13cml0ZS5jCi0t
LSBqY2Ytd3JpdGUuYwkyMDAwLzA5LzIzIDE3OjA5OjM5CTEuNjkKKysrIGpjZi13cml0ZS5jCTIw
MDAvMTAvMTYgMTc6MzY6MTMKQEAgLTM0Myw2ICszNDMsNyBAQCBzdGF0aWMgY2hhciAqbWFrZV9j
bGFzc19maWxlX25hbWUgUEFSQU1TCiBzdGF0aWMgdW5zaWduZWQgY2hhciAqYXBwZW5kX3N5bnRo
ZXRpY19hdHRyaWJ1dGUgUEFSQU1TICgoc3RydWN0IGpjZl9wYXJ0aWFsICopKTsKIHN0YXRpYyB2
b2lkIGFwcGVuZF9pbm5lcmNsYXNzZXNfYXR0cmlidXRlIFBBUkFNUyAoKHN0cnVjdCBqY2ZfcGFy
dGlhbCAqLCB0cmVlKSk7CiBzdGF0aWMgdm9pZCBhcHBlbmRfaW5uZXJjbGFzc2VzX2F0dHJpYnV0
ZV9lbnRyeSBQQVJBTVMgKChzdHJ1Y3QgamNmX3BhcnRpYWwgKiwgdHJlZSwgdHJlZSkpOworc3Rh
dGljIHZvaWQgYXBwZW5kX2djal9hdHRyaWJ1dGUgUEFSQU1TICgoc3RydWN0IGpjZl9wYXJ0aWFs
ICosIHRyZWUpKTsKIAogLyogVXRpbGl0eSBtYWNyb3MgZm9yIGFwcGVuZGluZyAoYmlnLWVuZGlh
bikgZGF0YSB0byBhIGJ1ZmZlci4KICAgIFdlIGFzc3VtZSBhIGxvY2FsIHZhcmlhYmxlICdwdHIn
IHBvaW50cyBpbnRvIHdoZXJlIHdlIHdhbnQgdG8KQEAgLTMwOTUsOCArMzA5NiwxMSBAQCBnZW5l
cmF0ZV9jbGFzc2ZpbGUgKGNsYXMsIHN0YXRlKQogICAgIH0KICAgcHRyID0gYXBwZW5kX2NodW5r
IChOVUxMLCAxMCwgc3RhdGUpOwogCi0gIGkgPSAoKElOTkVSX0NMQVNTX1RZUEVfUCAoY2xhcykg
Ci0JfHwgREVDTF9JTk5FUl9DTEFTU19MSVNUIChUWVBFX05BTUUgKGNsYXMpKSkgPyAyIDogMSk7
CisgIGkgPSAxOwkJLyogU291cmNlIGZpbGUgYWx3YXlzIGV4aXN0cyBhcyBhbiBhdHRyaWJ1dGUg
Ki8KKyAgaWYgKElOTkVSX0NMQVNTX1RZUEVfUCAoY2xhcykgfHwgREVDTF9JTk5FUl9DTEFTU19M
SVNUIChUWVBFX05BTUUgKGNsYXMpKSkKKyAgICBpKys7CisgIGlmIChjbGFzID09IG9iamVjdF90
eXBlX25vZGUpCisgICAgaSsrOwogICBQVVQyIChpKTsJCQkvKiBhdHRyaWJ1dGVzX2NvdW50ICov
CiAKICAgLyogZ2VuZXJhdGUgdGhlIFNvdXJjZUZpbGUgYXR0cmlidXRlLiAqLwpAQCAtMzExMSw2
ICszMTE1LDcgQEAgZ2VuZXJhdGVfY2xhc3NmaWxlIChjbGFzLCBzdGF0ZSkKICAgUFVUNCAoMik7
CiAgIGkgPSBmaW5kX3V0ZjhfY29uc3RhbnQgKCZzdGF0ZS0+Y3Bvb2wsIGdldF9pZGVudGlmaWVy
IChzb3VyY2VfZmlsZSkpOwogICBQVVQyIChpKTsKKyAgYXBwZW5kX2djal9hdHRyaWJ1dGUgKHN0
YXRlLCBjbGFzKTsKICAgYXBwZW5kX2lubmVyY2xhc3Nlc19hdHRyaWJ1dGUgKHN0YXRlLCBjbGFz
KTsKIAogICAvKiBOZXcgZmluYWxseSBnZW5lcmF0ZSB0aGUgY29udGVudHMgb2YgdGhlIGNvbnN0
YW50IHBvb2wgY2h1bmsuICovCkBAIC0zMTQwLDYgKzMxNDUsMjQgQEAgYXBwZW5kX3N5bnRoZXRp
Y19hdHRyaWJ1dGUgKHN0YXRlKQogICBQVVQ0ICgwKTsJCS8qIEF0dHJpYnV0ZSBsZW5ndGggKi8K
IAogICByZXR1cm4gcHRyOworfQorCitzdGF0aWMgdm9pZAorYXBwZW5kX2djal9hdHRyaWJ1dGUg
KHN0YXRlLCBjbGFzcykKKyAgICAgc3RydWN0IGpjZl9wYXJ0aWFsICpzdGF0ZTsKKyAgICAgdHJl
ZSBjbGFzczsKK3sKKyAgdW5zaWduZWQgY2hhciAqcHRyOworICBpbnQgaTsKKworICBpZiAoY2xh
c3MgIT0gb2JqZWN0X3R5cGVfbm9kZSkKKyAgICByZXR1cm47CisKKyAgcHRyID0gYXBwZW5kX2No
dW5rIChOVUxMLCA2LCBzdGF0ZSk7IC8qIDIrNCAqLworICBpID0gZmluZF91dGY4X2NvbnN0YW50
ICgmc3RhdGUtPmNwb29sLCAKKwkJCSAgZ2V0X2lkZW50aWZpZXIgKCJnbnUuZ2NqLmdjai1jb21w
aWxlZCIpKTsKKyAgUFVUMiAoaSk7CQkJLyogQXR0cmlidXRlIHN0cmluZyBpbmRleCAqLworICBQ
VVQ0ICgwKTsJCQkvKiBBdHRyaWJ1dGUgbGVuZ3RoICovCiB9CiAKIHN0YXRpYyB2b2lkCkluZGV4
OiBqY2YuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL2djYy9lZ2NzL2djYy9qYXZhL2pjZi5o
LHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjE4CmRpZmYgLXUgLXAgLXIxLjE4IGpjZi5oCi0tLSBq
Y2YuaAkyMDAwLzA1LzA5IDE5OjU1OjU2CTEuMTgKKysrIGpjZi5oCTIwMDAvMTAvMTYgMTc6MzY6
MTQKQEAgLTkwLDggKzkwLDkgQEAgdHlwZWRlZiBzdHJ1Y3QgSkNGIHsKICAgdW5zaWduZWQgY2hh
ciAqYnVmZmVyX2VuZDsKICAgdW5zaWduZWQgY2hhciAqcmVhZF9wdHI7CiAgIHVuc2lnbmVkIGNo
YXIgKnJlYWRfZW5kOwotICBpbnQgc2Vlbl9pbl96aXA7Ci0gIGludCBqYXZhX3NvdXJjZTsKKyAg
aW50IHNlZW5faW5femlwIDogMTsKKyAgaW50IGphdmFfc291cmNlIDogMTsKKyAgaW50IHJpZ2h0
X3ppcCA6IDE7CiAgIGxvbmcgemlwX29mZnNldDsgICAgCiAgIGpjZl9maWxidWZfdCBmaWxidWY7
CiAgIHZvaWQgKnJlYWRfc3RhdGU7CkBAIC0xNTUsNyArMTU2LDcgQEAgdHlwZWRlZiBzdHJ1Y3Qg
SkNGIHsKICNkZWZpbmUgSkNGX1pFUk8oSkNGKSAgXAogICAoKEpDRiktPmJ1ZmZlciA9IChKQ0Yp
LT5idWZmZXJfZW5kID0gKEpDRiktPnJlYWRfcHRyID0gKEpDRiktPnJlYWRfZW5kID0gMCxcCiAg
ICAoSkNGKS0+cmVhZF9zdGF0ZSA9IDAsIChKQ0YpLT5maWxlbmFtZSA9IChKQ0YpLT5jbGFzc25h
bWUgPSAwLCBcCi0gICBDUE9PTF9JTklUKCYoSkNGKS0+Y3Bvb2wpLCAoSkNGKS0+amF2YV9zb3Vy
Y2UgPSAwKQorICAgQ1BPT0xfSU5JVCgmKEpDRiktPmNwb29sKSwgKEpDRiktPmphdmFfc291cmNl
ID0gMCwgKEpDRiktPnJpZ2h0X3ppcCA9IDApCiAKIC8qIEdpdmVuIHRoYXQgUFRSIHBvaW50cyB0
byBhIDItYnl0ZSB1bnNpZ25lZCBpbnRlZ2VyIGluIG5ldHdvcmsKICAgIChiaWctZW5kaWFuKSBi
eXRlLW9yZGVyLCByZXR1cm4gdGhhdCBpbnRlZ2VyLiAqLwpJbmRleDogbGFuZy1vcHRpb25zLmgK
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9nY2MvZWdjcy9nY2MvamF2YS9sYW5nLW9wdGlvbnMu
aCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xNwpkaWZmIC11IC1wIC1yMS4xNyBsYW5nLW9wdGlv
bnMuaAotLS0gbGFuZy1vcHRpb25zLmgJMjAwMC8wOS8xMiAyMjoyMzo1OQkxLjE3CisrKyBsYW5n
LW9wdGlvbnMuaAkyMDAwLzEwLzE2IDE3OjM2OjE1CkBAIC01NCwzICs1NCw1IEBAIERFRklORV9M
QU5HX05BTUUgKCJKYXZhIikKICAgICAiV2FybiBpZiBtb2RpZmllcnMgYXJlIHNwZWNpZmllZCB3
aGVuIG5vdCBuZWNlc3NhcnkifSwKICAgeyAiLVd1bnN1cHBvcnRlZC1qZGsxMSIsICJXYXJuIGlm
IGBmaW5hbCcgbG9jYWwgdmFyaWFibGVzIGFyZSBzcGVjaWZpZWQifSwKICAgeyAiLVdleHRyYW5l
b3VzLXNlbWljb2xvbiIsICJXYXJuIGlmIGRlcHJlY2F0ZWQgZW1wdHkgc3RhdGVtZW50cyBhcmUg
Zm91bmQifSwKKyAgeyAiLWZmb3JjZS1jbGFzc2VzLWFyY2hpdmUtY2hlY2siLCAKKyAgICAiQWx3
YXlzIGNoZWNrIGZvciBub24gZ2NqIGdlbmVyYXRlZCBjbGFzc2VzIGFyY2hpdmVzIiB9LApJbmRl
eDogbGFuZy5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvZ2NjL2VnY3MvZ2NjL2phdmEvbGFu
Zy5jLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjQ5CmRpZmYgLXUgLXAgLXIxLjQ5IGxhbmcuYwot
LS0gbGFuZy5jCTIwMDAvMDkvMjMgMTc6MDk6MzkJMS40OQorKysgbGFuZy5jCTIwMDAvMTAvMTYg
MTc6MzY6MTYKQEAgLTEyOCw2ICsxMjgsOSBAQCBjaGFyICpjdXJyZW50X2VuY29kaW5nID0gTlVM
TDsKIC8qIFdoZW4gbm9uIHplcm8sIHJlcG9ydCB0aGUgbm93IGRlcHJlY2F0ZWQgZW1wdHkgc3Rh
dGVtZW50cy4gICovCiBpbnQgZmxhZ19leHRyYW5lb3VzX3NlbWljb2xvbjsKIAorLyogV2hlbiBu
b24gemVybywgYWx3YXlzIGNoZWNrIGZvciBhIG5vbiBnY2ogZ2VuZXJhdGVkIGNsYXNzZXMgYXJj
aGl2ZS4gICovCitpbnQgZmxhZ19mb3JjZV9jbGFzc2VzX2FyY2hpdmVfY2hlY2s7CisKIC8qIEZy
b20gZ2NjL2ZsYWdzLmgsIGFuZCBpbmRpY2F0ZXMgaWYgZXhjZXB0aW9ucyBhcmUgdHVybmVkIG9u
IG9yIG5vdC4gICovCiAKIGV4dGVybiBpbnQgZmxhZ19uZXdfZXhjZXB0aW9uczsKQEAgLTE0Nyw3
ICsxNTAsOCBAQCBsYW5nX2Zfb3B0aW9uc1tdID0KICAgeyJ1c2UtZGl2aWRlLXN1YnJvdXRpbmUi
LCAmZmxhZ191c2VfZGl2aWRlX3N1YnJvdXRpbmUsIDF9LAogICB7InVzZS1ib2VobS1nYyIsICZm
bGFnX3VzZV9ib2VobV9nYywgMX0sCiAgIHsiaGFzaC1zeW5jaHJvbml6YXRpb24iLCAmZmxhZ19o
YXNoX3N5bmNocm9uaXphdGlvbiwgMX0sCi0gIHsiam5pIiwgJmZsYWdfam5pLCAxfQorICB7Impu
aSIsICZmbGFnX2puaSwgMX0sCisgIHsiZm9yY2UtY2xhc3Nlcy1hcmNoaXZlLWNoZWNrIiwgJmZs
YWdfZm9yY2VfY2xhc3Nlc19hcmNoaXZlX2NoZWNrLCAxfQogfTsKIAogSkNGICpjdXJyZW50X2pj
ZjsK