54834 2011-02-20 14:41:54 -0800 Fix another crash when a plug-in is destroyed when evaluating JavaScript 2011-02-20 15:04:39 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 354313 0 andersca 2011-02-20 14:41:54 -0800 Fix another crash when a plug-in is destroyed when evaluating JavaScript 354316 1 83104 andersca 2011-02-20 14:47:00 -0800 Created attachment 83104 Patch 354317 2 andersca 2011-02-20 15:04:39 -0800 Committed r79156: <http://trac.webkit.org/changeset/79156> 83104 2011-02-20 14:47:00 -0800 2011-02-20 15:03:38 -0800 Patch bug-54834-20110220144658.patch text/plain 11542 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDc5MTU1KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDQgQEAKKzIwMTEtMDItMjAgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBGaXggYW5vdGhlciBjcmFzaCB3aGVuIGEgcGx1Zy1pbiBp cyBkZXN0cm95ZWQgd2hlbiBldmFsdWF0aW5nIEphdmFTY3JpcHQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU0ODM0CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS85MDEzMzg0PgorCisgICAgICAgIFRoaXMgY29udGFpbnMgdGhyZWUgc2VwYXJhdGUgZml4 ZXM6CisKKyAgICAgICAgLSBJbiB1bnByb3RlY3RQbHVnaW5Gcm9tRGVzdHJ1Y3Rpb24gd2UgY2Fu J3QganVzdCBkZXN0cm95IHRoZSBwbHVnLWluIG9uY2UKKyAgICAgICAgICB0aGUgY291bnQgcmVh Y2hlcyB6ZXJvLCBiZWNhdXNlIHRoZSBwbHVnLWluIG1pZ2h0IHN0aWxsIGhhdmUgY29kZSBleGVj dXRpbmcKKyAgICAgICAgICBvbiB0aGUgc3RhY2suIFRvIGZpeCB0aGlzIHdlIHVzZSBhIHplcm8t ZGVsYXkgdGltZXIgdG8gZGVmZXIgZGVzdHJ1Y3Rpb24KKyAgICAgICAgICBvZiB0aGUgcGx1Zy1p bi4KKworICAgICAgICAtIFRyeWluZyB0byBnZXQgdGhlIE5QT2JqZWN0IGZvciB0aGUgd2luZG93 IHVzaW5nIE5QTl9HZXRWYWx1ZSB3b3VsZCByZXR1cm4KKyAgICAgICAgICBOUEVSUl9OT19FUlJP UiwgZXZlbiBpZiB0aGUgcmV0dXJuZWQgTlBPYmplY3Qgd2FzIG51bGwuIEZpeCB0aGlzIHRvIHJl dHVybgorICAgICAgICAgIE5QRVJSX0dFTkVSSUNfRVJST1IgaW5zdGVhZC4KKworICAgICAgICAt IFByb3RlY3QgdGhlIHBsdWctaW4gZnJvbSBkZXN0cnVjdGlvbiBhbnl0aW1lIGFuIE5QQVBJIGNh bGwgdGhhdCBzZW5kcyBhIAorICAgICAgICAgIHN5bmNocm9ub3VzIElQQyBtZXNzYWdlIGlzIG1h ZGUuCisKKyAgICAgICAgKiBQbHVnaW5Qcm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94eS5jcHA6 CisgICAgICAgIChXZWJLaXQ6OlBsdWdpbkNvbnRyb2xsZXJQcm94eTo6UGx1Z2luQ29udHJvbGxl clByb3h5KToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luQ29udHJvbGxlclByb3h5OjpkZXN0cm95 KToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luQ29udHJvbGxlclByb3h5Ojp1bnByb3RlY3RQbHVn aW5Gcm9tRGVzdHJ1Y3Rpb24pOgorICAgICAgICAqIFBsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJv bGxlclByb3h5Lmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNj YXBlQnJvd3NlckZ1bmNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luRGVzdHJ1Y3Rpb25Q cm90ZWN0b3I6OlBsdWdpbkRlc3RydWN0aW9uUHJvdGVjdG9yKToKKyAgICAgICAgKFdlYktpdDo6 TlBOX0dldFZhbHVlKToKKyAgICAgICAgKFdlYktpdDo6TlBOX0V2YWx1YXRlKToKKyAgICAgICAg KFdlYktpdDo6TlBOX0dldFByb3BlcnR5KToKKyAgICAgICAgKFdlYktpdDo6TlBOX1NldFByb3Bl cnR5KToKKyAgICAgICAgKFdlYktpdDo6TlBOX1JlbW92ZVByb3BlcnR5KToKKyAgICAgICAgKFdl YktpdDo6TlBOX0hhc1Byb3BlcnR5KToKKyAgICAgICAgKFdlYktpdDo6TlBOX0hhc01ldGhvZCk6 CisgICAgICAgIChXZWJLaXQ6Ok5QTl9FbnVtZXJhdGUpOgorICAgICAgICAoV2ViS2l0OjpOUE5f Q29uc3RydWN0KToKKyAgICAgICAgKFdlYktpdDo6TlBOX0dldFZhbHVlRm9yVVJMKToKKyAgICAg ICAgKFdlYktpdDo6TlBOX1NldFZhbHVlRm9yVVJMKToKKwogMjAxMS0wMi0xOSAgU2FtIFdlaW5p ZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFuZGVycyBDYXJsc3Nv bi4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxlclBy b3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdp bkNvbnRyb2xsZXJQcm94eS5jcHAJKHJldmlzaW9uIDc5MTUzKQorKysgU291cmNlL1dlYktpdDIv UGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC01OSw3ICs1OSw3IEBAIFBsdWdpbkNvbnRyb2xsZXJQcm94eTo6UGx1Z2luQ29udHJvbGxlclAK ICAgICAsIG1faXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZChpc0FjY2VsZXJhdGVkQ29t cG9zaXRpbmdFbmFibGVkKQogICAgICwgbV9wYWludFRpbWVyKFJ1bkxvb3A6Om1haW4oKSwgdGhp cywgJlBsdWdpbkNvbnRyb2xsZXJQcm94eTo6cGFpbnQpCiAgICAgLCBtX3BsdWdpbkRlc3RydWN0 aW9uUHJvdGVjdENvdW50KDApCi0gICAgLCBtX3Nob3VsZERlc3Ryb3lQbHVnaW5XaGVuQ291bnRS ZWFjaGVzWmVybyhmYWxzZSkKKyAgICAsIG1fcGx1Z2luRGVzdHJveVRpbWVyKFJ1bkxvb3A6Om1h aW4oKSwgdGhpcywgJlBsdWdpbkNvbnRyb2xsZXJQcm94eTo6ZGVzdHJveSkKICAgICAsIG1fd2Fp dGluZ0ZvckRpZFVwZGF0ZShmYWxzZSkKICAgICAsIG1fcGx1Z2luQ2FuY2VsZWRNYW51YWxTdHJl YW1Mb2FkKGZhbHNlKQogI2lmIFBMQVRGT1JNKE1BQykKQEAgLTk4LDcgKzk4LDcgQEAgdm9pZCBQ bHVnaW5Db250cm9sbGVyUHJveHk6OmRlc3Ryb3koKQogICAgIGlmIChtX3BsdWdpbkRlc3RydWN0 aW9uUHJvdGVjdENvdW50KSB7CiAgICAgICAgIC8vIFdlIGhhdmUgcGx1Zy1pbiBjb2RlIG9uIHRo ZSBzdGFjayBzbyB3ZSBjYW4ndCBkZXN0cm95IGl0IHJpZ2h0IG5vdy4KICAgICAgICAgLy8gRGVz dHJveSBpdCBsYXRlci4KLSAgICAgICAgbV9zaG91bGREZXN0cm95UGx1Z2luV2hlbkNvdW50UmVh Y2hlc1plcm8gPSB0cnVlOworICAgICAgICBtX3BsdWdpbkRlc3Ryb3lUaW1lci5zdGFydE9uZVNo b3QoMCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTMwOSw4ICszMDksNiBAQCB2b2lk IFBsdWdpbkNvbnRyb2xsZXJQcm94eTo6dW5wcm90ZWN0UGx1CiAgICAgQVNTRVJUKG1fcGx1Z2lu RGVzdHJ1Y3Rpb25Qcm90ZWN0Q291bnQpOwogCiAgICAgbV9wbHVnaW5EZXN0cnVjdGlvblByb3Rl Y3RDb3VudC0tOwotICAgIGlmICghbV9wbHVnaW5EZXN0cnVjdGlvblByb3RlY3RDb3VudCAmJiBt X3Nob3VsZERlc3Ryb3lQbHVnaW5XaGVuQ291bnRSZWFjaGVzWmVybykKLSAgICAgICAgZGVzdHJv eSgpOwogfQogCiB2b2lkIFBsdWdpbkNvbnRyb2xsZXJQcm94eTo6ZnJhbWVEaWRGaW5pc2hMb2Fk aW5nKHVpbnQ2NF90IHJlcXVlc3RJRCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nl c3MvUGx1Z2luQ29udHJvbGxlclByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv UGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkuaAkocmV2aXNpb24gNzkxNTMpCisr KyBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94eS5oCSh3 b3JraW5nIGNvcHkpCkBAIC0xNjAsOSArMTYwLDEwIEBAIHByaXZhdGU6CiAgICAgCiAgICAgLy8g QSBjb3VudGVyIHVzZWQgdG8gcHJldmVudCB0aGUgcGx1Zy1pbiBmcm9tIGJlaW5nIGRlc3Ryb3ll ZC4KICAgICB1bnNpZ25lZCBtX3BsdWdpbkRlc3RydWN0aW9uUHJvdGVjdENvdW50OwotICAgIAot ICAgIC8vIFdoZXRoZXIgd2Ugc2hvdWxkIGRlc3Ryb3kgdGhlIHBsdWctaW4gd2hlbiB0aGUgY291 bnQgcmVhY2hlcyAwLgotICAgIGJvb2wgbV9zaG91bGREZXN0cm95UGx1Z2luV2hlbkNvdW50UmVh Y2hlc1plcm87CisKKyAgICAvLyBBIHRpbWVyIHRoYXQgd2UgdXNlIHRvIHByZXZlbnQgZGVzdHJ1 Y3Rpb24gb2YgdGhlIHBsdWctaW4gd2hpbGUgcGx1Zy1pbgorICAgIC8vIGNvZGUgaXMgb24gdGhl IHN0YWNrLgorICAgIFJ1bkxvb3A6OlRpbWVyPFBsdWdpbkNvbnRyb2xsZXJQcm94eT4gbV9wbHVn aW5EZXN0cm95VGltZXI7CiAKICAgICAvLyBXaGV0aGVyIHdlJ3JlIHdhaXRpbmcgZm9yIHRoZSBw bHVnLWluIHByb3h5IGluIHRoZSB3ZWIgcHJvY2VzcyB0byBkcmF3IHRoZSBjb250ZW50cyBvZiBp dHMKICAgICAvLyBiYWNraW5nIHN0b3JlIGludG8gdGhlIHdlYiBwcm9jZXNzIGJhY2tpbmcgc3Rv cmUuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0 c2NhcGVCcm93c2VyRnVuY3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZUJyb3dzZXJGdW5jcy5jcHAJKHJldmlzaW9u IDc5MTUzKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05l dHNjYXBlQnJvd3NlckZ1bmNzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjksNiArMjksNyBAQAog I2luY2x1ZGUgIk5QUnVudGltZVV0aWxpdGllcy5oIgogI2luY2x1ZGUgIk5ldHNjYXBlUGx1Z2lu LmgiCiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKKyNpbmNsdWRlICJQbHVnaW5Db250cm9s bGVyLmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9IVFRQSGVhZGVyTWFwLmg+CiAjaW5jbHVkZSA8V2Vi Q29yZS9JZGVudGlmaWVyUmVwLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9TaGFyZWRCdWZmZXIuaD4K QEAgLTM5LDYgKzQwLDE4IEBAIHVzaW5nIG5hbWVzcGFjZSBzdGQ7CiAKIG5hbWVzcGFjZSBXZWJL aXQgewogCisvLyBIZWxwZXIgY2xhc3MgZm9yIGRlbGF5aW5nIGRlc3RydWN0aW9uIG9mIGEgcGx1 Zy1pbi4KK2NsYXNzIFBsdWdpbkRlc3RydWN0aW9uUHJvdGVjdG9yIHsKK3B1YmxpYzoKKyAgICBl eHBsaWNpdCBQbHVnaW5EZXN0cnVjdGlvblByb3RlY3RvcihOZXRzY2FwZVBsdWdpbiogcGx1Z2lu KQorICAgICAgICA6IG1fcHJvdGVjdG9yKHN0YXRpY19jYXN0PFBsdWdpbio+KHBsdWdpbiktPmNv bnRyb2xsZXIoKSkKKyAgICB7CisgICAgfQorICAgIAorcHJpdmF0ZToKKyAgICBQbHVnaW5Db250 cm9sbGVyOjpQbHVnaW5EZXN0cnVjdGlvblByb3RlY3RvciBtX3Byb3RlY3RvcjsKK307CisKIHN0 YXRpYyBib29sIHN0YXJ0c1dpdGhCbGFua0xpbmUoY29uc3QgY2hhciogYnl0ZXMsIHVuc2lnbmVk IGxlbmd0aCkKIHsKICAgICByZXR1cm4gbGVuZ3RoID4gMCAmJiBieXRlc1swXSA9PSAnXG4nOwpA QCAtNDAxLDEzICs0MTQsMTggQEAgc3RhdGljIE5QRXJyb3IgTlBOX0dldFZhbHVlKE5QUCBucHAs IE5QTgogICAgIHN3aXRjaCAodmFyaWFibGUpIHsKICAgICAgICAgY2FzZSBOUE5WV2luZG93TlBP YmplY3Q6IHsKICAgICAgICAgICAgIFJlZlB0cjxOZXRzY2FwZVBsdWdpbj4gcGx1Z2luID0gTmV0 c2NhcGVQbHVnaW46OmZyb21OUFAobnBwKTsKKyAgICAgICAgICAgIFBsdWdpbkRlc3RydWN0aW9u UHJvdGVjdG9yIHByb3RlY3RvcihwbHVnaW4uZ2V0KCkpOwogCiAgICAgICAgICAgICBOUE9iamVj dCogd2luZG93TlBPYmplY3QgPSBwbHVnaW4tPndpbmRvd1NjcmlwdE5QT2JqZWN0KCk7CisgICAg ICAgICAgICBpZiAoIXdpbmRvd05QT2JqZWN0KQorICAgICAgICAgICAgICAgIHJldHVybiBOUEVS Ul9HRU5FUklDX0VSUk9SOworCiAgICAgICAgICAgICAqKE5QT2JqZWN0KiopdmFsdWUgPSB3aW5k b3dOUE9iamVjdDsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAgIGNhc2Ug TlBOVlBsdWdpbkVsZW1lbnROUE9iamVjdDogewogICAgICAgICAgICAgUmVmUHRyPE5ldHNjYXBl UGx1Z2luPiBwbHVnaW4gPSBOZXRzY2FwZVBsdWdpbjo6ZnJvbU5QUChucHApOworICAgICAgICAg ICAgUGx1Z2luRGVzdHJ1Y3Rpb25Qcm90ZWN0b3IgcHJvdGVjdG9yKHBsdWdpbi5nZXQoKSk7CiAK ICAgICAgICAgICAgIE5QT2JqZWN0KiBwbHVnaW5FbGVtZW50TlBPYmplY3QgPSBwbHVnaW4tPnBs dWdpbkVsZW1lbnROUE9iamVjdCgpOwogICAgICAgICAgICAgKihOUE9iamVjdCoqKXZhbHVlID0g cGx1Z2luRWxlbWVudE5QT2JqZWN0OwpAQCAtNjA1LDQ1ICs2MjMsNjIgQEAgc3RhdGljIGJvb2wg TlBOX0ludm9rZURlZmF1bHQoTlBQLCBOUE9iagogc3RhdGljIGJvb2wgTlBOX0V2YWx1YXRlKE5Q UCBucHAsIE5QT2JqZWN0ICpucE9iamVjdCwgTlBTdHJpbmcgKnNjcmlwdCwgTlBWYXJpYW50KiBy ZXN1bHQpCiB7CiAgICAgUmVmUHRyPE5ldHNjYXBlUGx1Z2luPiBwbHVnaW4gPSBOZXRzY2FwZVBs dWdpbjo6ZnJvbU5QUChucHApOworICAgIFBsdWdpbkRlc3RydWN0aW9uUHJvdGVjdG9yIHByb3Rl Y3RvcihwbHVnaW4uZ2V0KCkpOworICAgIAogICAgIFN0cmluZyBzY3JpcHRTdHJpbmcgPSBTdHJp bmc6OmZyb21VVEY4V2l0aExhdGluMUZhbGxiYWNrKHNjcmlwdC0+VVRGOENoYXJhY3RlcnMsIHNj cmlwdC0+VVRGOExlbmd0aCk7CiAgICAgCiAgICAgcmV0dXJuIHBsdWdpbi0+ZXZhbHVhdGUobnBP YmplY3QsIHNjcmlwdFN0cmluZywgcmVzdWx0KTsKIH0KIAotc3RhdGljIGJvb2wgTlBOX0dldFBy b3BlcnR5KE5QUCwgTlBPYmplY3QqIG5wT2JqZWN0LCBOUElkZW50aWZpZXIgcHJvcGVydHlOYW1l LCBOUFZhcmlhbnQqIHJlc3VsdCkKK3N0YXRpYyBib29sIE5QTl9HZXRQcm9wZXJ0eShOUFAgbnBw LCBOUE9iamVjdCogbnBPYmplY3QsIE5QSWRlbnRpZmllciBwcm9wZXJ0eU5hbWUsIE5QVmFyaWFu dCogcmVzdWx0KQogeworICAgIFJlZlB0cjxOZXRzY2FwZVBsdWdpbj4gcGx1Z2luID0gTmV0c2Nh cGVQbHVnaW46OmZyb21OUFAobnBwKTsKKyAgICBQbHVnaW5EZXN0cnVjdGlvblByb3RlY3RvciBw cm90ZWN0b3IocGx1Z2luLmdldCgpKTsKKyAgICAKICAgICBpZiAobnBPYmplY3QtPl9jbGFzcy0+ Z2V0UHJvcGVydHkpCiAgICAgICAgIHJldHVybiBucE9iamVjdC0+X2NsYXNzLT5nZXRQcm9wZXJ0 eShucE9iamVjdCwgcHJvcGVydHlOYW1lLCByZXN1bHQpOwogICAgIAogICAgIHJldHVybiBmYWxz ZTsKIH0KIAotc3RhdGljIGJvb2wgTlBOX1NldFByb3BlcnR5KE5QUCwgTlBPYmplY3QqIG5wT2Jq ZWN0LCBOUElkZW50aWZpZXIgcHJvcGVydHlOYW1lLCBjb25zdCBOUFZhcmlhbnQqIHZhbHVlKQor c3RhdGljIGJvb2wgTlBOX1NldFByb3BlcnR5KE5QUCBucHAsIE5QT2JqZWN0KiBucE9iamVjdCwg TlBJZGVudGlmaWVyIHByb3BlcnR5TmFtZSwgY29uc3QgTlBWYXJpYW50KiB2YWx1ZSkKIHsKKyAg ICBSZWZQdHI8TmV0c2NhcGVQbHVnaW4+IHBsdWdpbiA9IE5ldHNjYXBlUGx1Z2luOjpmcm9tTlBQ KG5wcCk7CisgICAgUGx1Z2luRGVzdHJ1Y3Rpb25Qcm90ZWN0b3IgcHJvdGVjdG9yKHBsdWdpbi5n ZXQoKSk7CisgICAgCiAgICAgaWYgKG5wT2JqZWN0LT5fY2xhc3MtPnNldFByb3BlcnR5KQogICAg ICAgICByZXR1cm4gbnBPYmplY3QtPl9jbGFzcy0+c2V0UHJvcGVydHkobnBPYmplY3QsIHByb3Bl cnR5TmFtZSwgdmFsdWUpOwogCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1zdGF0aWMgYm9vbCBO UE5fUmVtb3ZlUHJvcGVydHkoTlBQLCBOUE9iamVjdCogbnBPYmplY3QsIE5QSWRlbnRpZmllciBw cm9wZXJ0eU5hbWUpCitzdGF0aWMgYm9vbCBOUE5fUmVtb3ZlUHJvcGVydHkoTlBQIG5wcCwgTlBP YmplY3QqIG5wT2JqZWN0LCBOUElkZW50aWZpZXIgcHJvcGVydHlOYW1lKQogeworICAgIFJlZlB0 cjxOZXRzY2FwZVBsdWdpbj4gcGx1Z2luID0gTmV0c2NhcGVQbHVnaW46OmZyb21OUFAobnBwKTsK KyAgICBQbHVnaW5EZXN0cnVjdGlvblByb3RlY3RvciBwcm90ZWN0b3IocGx1Z2luLmdldCgpKTsK KyAgICAKICAgICBpZiAobnBPYmplY3QtPl9jbGFzcy0+cmVtb3ZlUHJvcGVydHkpCiAgICAgICAg IHJldHVybiBucE9iamVjdC0+X2NsYXNzLT5yZW1vdmVQcm9wZXJ0eShucE9iamVjdCwgcHJvcGVy dHlOYW1lKTsKIAogICAgIHJldHVybiBmYWxzZTsKIH0KIAotc3RhdGljIGJvb2wgTlBOX0hhc1By b3BlcnR5KE5QUCwgTlBPYmplY3QqIG5wT2JqZWN0LCBOUElkZW50aWZpZXIgcHJvcGVydHlOYW1l KQorc3RhdGljIGJvb2wgTlBOX0hhc1Byb3BlcnR5KE5QUCBucHAsIE5QT2JqZWN0KiBucE9iamVj dCwgTlBJZGVudGlmaWVyIHByb3BlcnR5TmFtZSkKIHsKKyAgICBSZWZQdHI8TmV0c2NhcGVQbHVn aW4+IHBsdWdpbiA9IE5ldHNjYXBlUGx1Z2luOjpmcm9tTlBQKG5wcCk7CisgICAgUGx1Z2luRGVz dHJ1Y3Rpb25Qcm90ZWN0b3IgcHJvdGVjdG9yKHBsdWdpbi5nZXQoKSk7CisgICAgCiAgICAgaWYg KG5wT2JqZWN0LT5fY2xhc3MtPmhhc1Byb3BlcnR5KQogICAgICAgICByZXR1cm4gbnBPYmplY3Qt Pl9jbGFzcy0+aGFzUHJvcGVydHkobnBPYmplY3QsIHByb3BlcnR5TmFtZSk7CiAKICAgICByZXR1 cm4gZmFsc2U7CiB9CiAKLXN0YXRpYyBib29sIE5QTl9IYXNNZXRob2QoTlBQLCBOUE9iamVjdCog bnBPYmplY3QsIE5QSWRlbnRpZmllciBtZXRob2ROYW1lKQorc3RhdGljIGJvb2wgTlBOX0hhc01l dGhvZChOUFAgbnBwLCBOUE9iamVjdCogbnBPYmplY3QsIE5QSWRlbnRpZmllciBtZXRob2ROYW1l KQogeworICAgIFJlZlB0cjxOZXRzY2FwZVBsdWdpbj4gcGx1Z2luID0gTmV0c2NhcGVQbHVnaW46 OmZyb21OUFAobnBwKTsKKyAgICBQbHVnaW5EZXN0cnVjdGlvblByb3RlY3RvciBwcm90ZWN0b3Io cGx1Z2luLmdldCgpKTsKKyAgICAKICAgICBpZiAobnBPYmplY3QtPl9jbGFzcy0+aGFzTWV0aG9k KQogICAgICAgICByZXR1cm4gbnBPYmplY3QtPl9jbGFzcy0+aGFzTWV0aG9kKG5wT2JqZWN0LCBt ZXRob2ROYW1lKTsKIApAQCAtNjcyLDggKzcwNywxMSBAQCBzdGF0aWMgdm9pZCBOUE5fUG9wUG9w dXBzRW5hYmxlZFN0YXRlKE5QCiAgICAgcGx1Z2luLT5wb3BQb3B1cHNFbmFibGVkU3RhdGUoKTsK IH0KICAgICAKLXN0YXRpYyBib29sIE5QTl9FbnVtZXJhdGUoTlBQLCBOUE9iamVjdCogbnBPYmpl Y3QsIE5QSWRlbnRpZmllcioqIGlkZW50aWZpZXJzLCB1aW50MzJfdCogaWRlbnRpZmllckNvdW50 KQorc3RhdGljIGJvb2wgTlBOX0VudW1lcmF0ZShOUFAgbnBwLCBOUE9iamVjdCogbnBPYmplY3Qs IE5QSWRlbnRpZmllcioqIGlkZW50aWZpZXJzLCB1aW50MzJfdCogaWRlbnRpZmllckNvdW50KQog eworICAgIFJlZlB0cjxOZXRzY2FwZVBsdWdpbj4gcGx1Z2luID0gTmV0c2NhcGVQbHVnaW46OmZy b21OUFAobnBwKTsKKyAgICBQbHVnaW5EZXN0cnVjdGlvblByb3RlY3RvciBwcm90ZWN0b3IocGx1 Z2luLmdldCgpKTsKKyAgICAKICAgICBpZiAoTlBfQ0xBU1NfU1RSVUNUX1ZFUlNJT05fSEFTX0VO VU0obnBPYmplY3QtPl9jbGFzcykgJiYgbnBPYmplY3QtPl9jbGFzcy0+ZW51bWVyYXRlKQogICAg ICAgICByZXR1cm4gbnBPYmplY3QtPl9jbGFzcy0+ZW51bWVyYXRlKG5wT2JqZWN0LCBpZGVudGlm aWVycywgaWRlbnRpZmllckNvdW50KTsKIApAQCAtNjg1LDggKzcyMywxMSBAQCBzdGF0aWMgdm9p ZCBOUE5fUGx1Z2luVGhyZWFkQXN5bmNDYWxsKE5QCiAgICAgbm90SW1wbGVtZW50ZWQoKTsKIH0K IAotc3RhdGljIGJvb2wgTlBOX0NvbnN0cnVjdChOUFAsIE5QT2JqZWN0KiBucE9iamVjdCwgY29u c3QgTlBWYXJpYW50KiBhcmd1bWVudHMsIHVpbnQzMl90IGFyZ3VtZW50Q291bnQsIE5QVmFyaWFu dCogcmVzdWx0KQorc3RhdGljIGJvb2wgTlBOX0NvbnN0cnVjdChOUFAgbnBwLCBOUE9iamVjdCog bnBPYmplY3QsIGNvbnN0IE5QVmFyaWFudCogYXJndW1lbnRzLCB1aW50MzJfdCBhcmd1bWVudENv dW50LCBOUFZhcmlhbnQqIHJlc3VsdCkKIHsKKyAgICBSZWZQdHI8TmV0c2NhcGVQbHVnaW4+IHBs dWdpbiA9IE5ldHNjYXBlUGx1Z2luOjpmcm9tTlBQKG5wcCk7CisgICAgUGx1Z2luRGVzdHJ1Y3Rp b25Qcm90ZWN0b3IgcHJvdGVjdG9yKHBsdWdpbi5nZXQoKSk7CisgICAgCiAgICAgaWYgKE5QX0NM QVNTX1NUUlVDVF9WRVJTSU9OX0hBU19DVE9SKG5wT2JqZWN0LT5fY2xhc3MpICYmIG5wT2JqZWN0 LT5fY2xhc3MtPmNvbnN0cnVjdCkKICAgICAgICAgcmV0dXJuIG5wT2JqZWN0LT5fY2xhc3MtPmNv bnN0cnVjdChucE9iamVjdCwgYXJndW1lbnRzLCBhcmd1bWVudENvdW50LCByZXN1bHQpOwogCkBA IC03MTYsNyArNzU3LDggQEAgc3RhdGljIE5QRXJyb3IgTlBOX0dldFZhbHVlRm9yVVJMKE5QUCBu cAogICAgIHN3aXRjaCAodmFyaWFibGUpIHsKICAgICAgICAgY2FzZSBOUE5VUkxWQ29va2llOiB7 CiAgICAgICAgICAgICBSZWZQdHI8TmV0c2NhcGVQbHVnaW4+IHBsdWdpbiA9IE5ldHNjYXBlUGx1 Z2luOjpmcm9tTlBQKG5wcCk7Ci0KKyAgICAgICAgICAgIFBsdWdpbkRlc3RydWN0aW9uUHJvdGVj dG9yIHByb3RlY3RvcihwbHVnaW4uZ2V0KCkpOworICAgICAgICAgICAgCiAgICAgICAgICAgICBT dHJpbmcgY29va2llcyA9IHBsdWdpbi0+Y29va2llc0ZvclVSTChtYWtlVVJMU3RyaW5nKHVybCkp OwogICAgICAgICAgICAgaWYgKGNvb2tpZXMuaXNOdWxsKCkpCiAgICAgICAgICAgICAgICAgcmV0 dXJuIE5QRVJSX0dFTkVSSUNfRVJST1I7CkBAIC03MjYsNyArNzY4LDggQEAgc3RhdGljIE5QRXJy b3IgTlBOX0dldFZhbHVlRm9yVVJMKE5QUCBucAogCiAgICAgICAgIGNhc2UgTlBOVVJMVlByb3h5 OiB7CiAgICAgICAgICAgICBSZWZQdHI8TmV0c2NhcGVQbHVnaW4+IHBsdWdpbiA9IE5ldHNjYXBl UGx1Z2luOjpmcm9tTlBQKG5wcCk7Ci0KKyAgICAgICAgICAgIFBsdWdpbkRlc3RydWN0aW9uUHJv dGVjdG9yIHByb3RlY3RvcihwbHVnaW4uZ2V0KCkpOworICAgICAgICAgICAgCiAgICAgICAgICAg ICBTdHJpbmcgcHJveGllcyA9IHBsdWdpbi0+cHJveGllc0ZvclVSTChtYWtlVVJMU3RyaW5nKHVy bCkpOwogICAgICAgICAgICAgaWYgKHByb3hpZXMuaXNOdWxsKCkpCiAgICAgICAgICAgICAgICAg cmV0dXJuIE5QRVJSX0dFTkVSSUNfRVJST1I7CkBAIC03NDQsNyArNzg3LDggQEAgc3RhdGljIE5Q RXJyb3IgTlBOX1NldFZhbHVlRm9yVVJMKE5QUCBucAogICAgIHN3aXRjaCAodmFyaWFibGUpIHsK ICAgICAgICAgY2FzZSBOUE5VUkxWQ29va2llOiB7CiAgICAgICAgICAgICBSZWZQdHI8TmV0c2Nh cGVQbHVnaW4+IHBsdWdpbiA9IE5ldHNjYXBlUGx1Z2luOjpmcm9tTlBQKG5wcCk7Ci0KKyAgICAg ICAgICAgIFBsdWdpbkRlc3RydWN0aW9uUHJvdGVjdG9yIHByb3RlY3RvcihwbHVnaW4uZ2V0KCkp OworICAgICAgICAgICAgCiAgICAgICAgICAgICBwbHVnaW4tPnNldENvb2tpZXNGb3JVUkwobWFr ZVVSTFN0cmluZyh1cmwpLCBTdHJpbmcodmFsdWUsIGxlbikpOwogICAgICAgICAgICAgcmV0dXJu IE5QRVJSX05PX0VSUk9SOwogICAgICAgICB9Cg==