34727 2010-02-08 14:57:01 -0800 Assertion crashes and freezes when plug-in property access results in an exception 2010-02-09 12:14:41 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 ap ap oldest_to_newest 188772 0 ap 2010-02-08 14:57:01 -0800 Our code isn't prepared to plug-in calling NPN_SetException during property access. 188792 1 48367 ap 2010-02-08 15:15:58 -0800 Created attachment 48367 proposed fix 188794 2 48367 darin 2010-02-08 15:18:59 -0800 Comment on attachment 48367 proposed fix > static void setGlobalException(JSC::UString exception); Maybe this argument name should be a const &, but that's not new to your code. > + static void moveGlobalExceptionToExecState(ExecState* exec); You should omit the argument name there. r=me 188802 3 ap 2010-02-08 15:28:05 -0800 Committed <http://trac.webkit.org/changeset/54516>. 189116 4 ap 2010-02-09 12:14:41 -0800 <rdar://problem/7124241> 48367 2010-02-08 15:15:58 -0800 2010-02-08 15:18:59 -0800 proposed fix AOLMailOpenSource.txt text/plain 18681 ap SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NDUxMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMTAtMDItMDggIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBs ZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0NzI3CisgICAgICAgIEFz c2VydGlvbiBjcmFzaGVzIGFuZCBmcmVlemVzIHdoZW4gcGx1Zy1pbiBwcm9wZXJ0eSBhY2Nlc3Mg cmVzdWx0cyBpbiBhbiBleGNlcHRpb24KKworICAgICAgICBUZXN0OiBwbHVnaW5zL25ldHNjYXBl LXBsdWdpbi1wcm9wZXJ0eS1hY2Nlc3MtZXhjZXB0aW9uLmh0bWwKKworICAgICAgICAqIGJyaWRn ZS9jL2NfaW5zdGFuY2UuaDogTWFkZSBtb3ZlR2xvYmFsRXhjZXB0aW9uVG9FeGVjU3RhdGUgcHVi bGljLCBzaW5jZSBpdCBhbHNvIG5lZWQgdG8KKyAgICAgICAgYmUgY2FsbGVkIGZyb20gQ0ZpZWxk LgorCisgICAgICAgICogYnJpZGdlL2MvY19ydW50aW1lLmNwcDoKKyAgICAgICAgKEpTQzo6Qmlu ZGluZ3M6OkNGaWVsZDo6dmFsdWVGcm9tSW5zdGFuY2UpOiBDYWxsIG1vdmVHbG9iYWxFeGNlcHRp b25Ub0V4ZWNTdGF0ZSgpLiBXaXRob3V0CisgICAgICAgIHRoaXMsIG5vdCBvbmx5IGRpZG4ndCB3 ZSBnZXQgZXhjZXB0aW9ucywgYnV0IHdlIGFsc28gZ290IGFuIGFzc2VydGlvbiBmYWlsdXJlIGJl Y2F1c2Ugb2YKKyAgICAgICAgZGFuZ2xpbmcgZ2xvYmFsIGV4Y2VwdGlvbiBvbiBuZXh0IGNhbGwg aW50byBwbHVnLWluLgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6Q0ZpZWxkOjpzZXRWYWx1ZVRv SW5zdGFuY2UpOiBEaXR0by4KKwogMjAxMC0wMi0wOCAgRGlyayBTY2h1bHplICA8a3JpdEB3ZWJr aXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4IG9mIENocm9taXVtV2luLgpJ bmRleDogV2ViQ29yZS9icmlkZ2UvYy9jX2luc3RhbmNlLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9icmlkZ2UvYy9jX2luc3RhbmNlLmgJKHJldmlzaW9uIDU0MjkzKQorKysgV2ViQ29yZS9icmlk Z2UvYy9jX2luc3RhbmNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTUwLDYgKzUwLDcgQEAgcHVibGlj OgogICAgIH0KIAogICAgIHN0YXRpYyB2b2lkIHNldEdsb2JhbEV4Y2VwdGlvbihKU0M6OlVTdHJp bmcgZXhjZXB0aW9uKTsKKyAgICBzdGF0aWMgdm9pZCBtb3ZlR2xvYmFsRXhjZXB0aW9uVG9FeGVj U3RhdGUoRXhlY1N0YXRlKiBleGVjKTsKIAogICAgIH5DSW5zdGFuY2UgKCk7CiAKQEAgLTc0LDcg Kzc1LDYgQEAgcHVibGljOgogICAgIE5QT2JqZWN0ICpnZXRPYmplY3QoKSBjb25zdCB7IHJldHVy biBfb2JqZWN0OyB9CiAKIHByaXZhdGU6Ci0gICAgc3RhdGljIHZvaWQgbW92ZUdsb2JhbEV4Y2Vw dGlvblRvRXhlY1N0YXRlKEV4ZWNTdGF0ZSogZXhlYyk7CiAgICAgQ0luc3RhbmNlKE5QT2JqZWN0 KiwgUGFzc1JlZlB0cjxSb290T2JqZWN0Pik7CiAKICAgICBtdXRhYmxlIENDbGFzcyAqX2NsYXNz OwpJbmRleDogV2ViQ29yZS9icmlkZ2UvYy9jX3J1bnRpbWUuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvYnJpZGdlL2MvY19ydW50aW1lLmNwcAkocmV2aXNpb24gNTQyOTMpCisrKyBXZWJDb3Jl L2JyaWRnZS9jL2NfcnVudGltZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ5LDYgKzQ5LDcgQEAg SlNWYWx1ZSBDRmllbGQ6OnZhbHVlRnJvbUluc3RhbmNlKEV4ZWNTdAogICAgICAgICB7CiAgICAg ICAgICAgICBKU0xvY2s6OkRyb3BBbGxMb2NrcyBkcm9wQWxsTG9ja3MoU2lsZW5jZUFzc2VydGlv bnNPbmx5KTsKICAgICAgICAgICAgIHJlc3VsdCA9IG9iai0+X2NsYXNzLT5nZXRQcm9wZXJ0eShv YmosIF9maWVsZElkZW50aWZpZXIsICZwcm9wZXJ0eSk7CisgICAgICAgICAgICBDSW5zdGFuY2U6 Om1vdmVHbG9iYWxFeGNlcHRpb25Ub0V4ZWNTdGF0ZShleGVjKTsKICAgICAgICAgfQogICAgICAg ICBpZiAocmVzdWx0KSB7CiAgICAgICAgICAgICBKU1ZhbHVlIHJlc3VsdCA9IGNvbnZlcnROUFZh cmlhbnRUb1ZhbHVlKGV4ZWMsICZwcm9wZXJ0eSwgaW5zdGFuY2UtPnJvb3RPYmplY3QoKSk7CkBA IC03MCw2ICs3MSw3IEBAIHZvaWQgQ0ZpZWxkOjpzZXRWYWx1ZVRvSW5zdGFuY2UoRXhlY1N0YXQK ICAgICAgICAgewogICAgICAgICAgICAgSlNMb2NrOjpEcm9wQWxsTG9ja3MgZHJvcEFsbExvY2tz KFNpbGVuY2VBc3NlcnRpb25zT25seSk7CiAgICAgICAgICAgICBvYmotPl9jbGFzcy0+c2V0UHJv cGVydHkob2JqLCBfZmllbGRJZGVudGlmaWVyLCAmdmFyaWFudCk7CisgICAgICAgICAgICBDSW5z dGFuY2U6Om1vdmVHbG9iYWxFeGNlcHRpb25Ub0V4ZWNTdGF0ZShleGVjKTsKICAgICAgICAgfQog CiAgICAgICAgIF9OUE5fUmVsZWFzZVZhcmlhbnRWYWx1ZSgmdmFyaWFudCk7CkluZGV4OiBXZWJL aXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL0NoYW5nZUxvZwkocmV2 aXNpb24gNTQ1MTEpCisrKyBXZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAt MSwzICsxLDI4IEBACisyMDEwLTAyLTA4ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDcyNworICAgICAgICBBc3Nl cnRpb24gY3Jhc2hlcyBhbmQgZnJlZXplcyB3aGVuIHBsdWctaW4gcHJvcGVydHkgYWNjZXNzIHJl c3VsdHMgaW4gYW4gZXhjZXB0aW9uCisKKyAgICAgICAgKiBQbHVnaW5zL0hvc3RlZC9XZWJLaXRQ bHVnaW5DbGllbnQuZGVmczogTWFkZSBQQ1NldFByb3BlcnR5IGFuZCBQQ1JlbW92ZVByb3BlcnR5 IGFzeW5jLgorICAgICAgICBBIHBsdWctaW4gY2FuIGNhbGwgYmFjayB3aGlsIHByb2Nlc3Npbmcg dGhpcyBjYWxsIChlLmcuIGZvciBOUE5fU2V0RXhjZXB0aW9uKSwgc28gd2UgbmVlZAorICAgICAg ICB0byBsaXN0ZW4gZm9yIG1lc3NhZ2VzIHdoaWxlIHdhaXRpbmcgZm9yIHJlcGx5LgorCisgICAg ICAgICogUGx1Z2lucy9Ib3N0ZWQvTmV0c2NhcGVQbHVnaW5Ib3N0UHJveHkubW06CisgICAgICAg IChXS1BDRXZhbHVhdGUpOiBJZiB0aGVyZSBpcyBubyBpbnN0YW5jZSBwcm94eSwgcmV0dXJuIEtF Uk5fRkFJTFVSRS4gVGhpcyBpbXByb3ZlcyBjb25zaXN0ZW5jeQorICAgICAgICBiZXR3ZWVuIG1l dGhvZCBpbXBsZW1lbnRhdGlvbnMsIGFuZCBsZWF2ZXMgdXMgd2l0aCBvbmUgbGVzcyBJUEMgY2Fs bCB0byBtYWtlIGluIGZhaWx1cmUgY2FzZQorICAgICAgICAocmV0dXJuaW5nIGZhbHNlIHdpdGgg S0VSTl9TVUNDRVNTIGFuZCByZXR1cm5pbmcgS0VSTl9GQUlMVVJFIGxvb2tzIHRoZSBzYW1lIGZy b20gcGx1Z2luCisgICAgICAgIGhvc3QgY29kZSkuCisgICAgICAgIChXS1BDSW52b2tlKTogRGl0 dG8uCisgICAgICAgIChXS1BDSW52b2tlRGVmYXVsdCk6IERpdHRvLgorICAgICAgICAoV0tQQ0dl dFByb3BlcnR5KTogRGl0dG8uCisgICAgICAgIChXS1BDU2V0UHJvcGVydHkpOiBTZW5kIGEgcmVw bHkgb25jZSBkb25lLgorICAgICAgICAoV0tQQ1JlbW92ZVByb3BlcnR5KTogRGl0dG8uCisgICAg ICAgIChXS1BDSGFzUHJvcGVydHkpOiBJZiB0aGVyZSBpcyBubyBpbnN0YW5jZSBwcm94eSwgcmV0 dXJuIEtFUk5fRkFJTFVSRS4KKyAgICAgICAgKFdLUENIYXNNZXRob2QpOiBEaXR0by4KKyAgICAg ICAgKFdLUENFbnVtZXJhdGUpOiBEaXR0by4KKwogMjAxMC0wMi0wOCAgQWxleGV5IFByb3NrdXJ5 YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbmRlcnMgQ2FybHNz b24uCkluZGV4OiBXZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL05ldHNjYXBlUGx1Z2luSG9zdFBy b3h5Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQvTmV0c2NhcGVQ bHVnaW5Ib3N0UHJveHkubW0JKHJldmlzaW9uIDU0NTA0KQorKysgV2ViS2l0L21hYy9QbHVnaW5z L0hvc3RlZC9OZXRzY2FwZVBsdWdpbkhvc3RQcm94eS5tbQkod29ya2luZyBjb3B5KQpAQCAtNTY5 LDEwICs1NjksOCBAQCBrZXJuX3JldHVybl90IFdLUENFdmFsdWF0ZShtYWNoX3BvcnRfdCBjCiAg ICAgICAgIHJldHVybiBLRVJOX0ZBSUxVUkU7CiAgICAgCiAgICAgTmV0c2NhcGVQbHVnaW5JbnN0 YW5jZVByb3h5KiBpbnN0YW5jZVByb3h5ID0gaG9zdFByb3h5LT5wbHVnaW5JbnN0YW5jZShwbHVn aW5JRCk7Ci0gICAgaWYgKCFpbnN0YW5jZVByb3h5KSB7Ci0gICAgICAgIF9XS1BIQm9vbGVhbkFu ZERhdGFSZXBseShob3N0UHJveHktPnBvcnQoKSwgcGx1Z2luSUQsIHJlcXVlc3RJRCwgZmFsc2Us IDAsIDApOwotICAgICAgICByZXR1cm4gS0VSTl9TVUNDRVNTOwotICAgIH0KKyAgICBpZiAoIWlu c3RhbmNlUHJveHkpCisgICAgICAgIHJldHVybiBLRVJOX0ZBSUxVUkU7CiAKICAgICBQbHVnaW5E ZXN0cm95RGVmZXJyZXIgZGVmZXJyZXIoaW5zdGFuY2VQcm94eSk7CiAgICAgCkBAIC02MjYsMTgg KzYyNCwxNCBAQCBrZXJuX3JldHVybl90IFdLUENJbnZva2UobWFjaF9wb3J0X3QgY2xpCiAgICAg ICAgIHJldHVybiBLRVJOX0ZBSUxVUkU7CiAgICAgCiAgICAgTmV0c2NhcGVQbHVnaW5JbnN0YW5j ZVByb3h5KiBpbnN0YW5jZVByb3h5ID0gaG9zdFByb3h5LT5wbHVnaW5JbnN0YW5jZShwbHVnaW5J RCk7Ci0gICAgaWYgKCFpbnN0YW5jZVByb3h5KSB7Ci0gICAgICAgIF9XS1BIQm9vbGVhbkFuZERh dGFSZXBseShob3N0UHJveHktPnBvcnQoKSwgcGx1Z2luSUQsIHJlcXVlc3RJRCwgZmFsc2UsIDAs IDApOwotICAgICAgICByZXR1cm4gS0VSTl9TVUNDRVNTOwotICAgIH0KKyAgICBpZiAoIWluc3Rh bmNlUHJveHkpCisgICAgICAgIHJldHVybiBLRVJOX0ZBSUxVUkU7CiAKICAgICBQbHVnaW5EZXN0 cm95RGVmZXJyZXIgZGVmZXJyZXIoaW5zdGFuY2VQcm94eSk7CiAgICAgCiAgICAgSWRlbnRpZmll clJlcCogaWRlbnRpZmllciA9IHJlaW50ZXJwcmV0X2Nhc3Q8SWRlbnRpZmllclJlcCo+KHNlcnZl cklkZW50aWZpZXIpOwotICAgIGlmICghSWRlbnRpZmllclJlcDo6aXNWYWxpZChpZGVudGlmaWVy KSkgewotICAgICAgICBfV0tQSEJvb2xlYW5BbmREYXRhUmVwbHkoaG9zdFByb3h5LT5wb3J0KCks IGluc3RhbmNlUHJveHktPnBsdWdpbklEKCksIHJlcXVlc3RJRCwgZmFsc2UsIDAsIDApOwotICAg ICAgICByZXR1cm4gS0VSTl9TVUNDRVNTOwotICAgIH0KKyAgICBpZiAoIUlkZW50aWZpZXJSZXA6 OmlzVmFsaWQoaWRlbnRpZmllcikpCisgICAgICAgIHJldHVybiBLRVJOX0ZBSUxVUkU7CiAKICAg ICBJZGVudGlmaWVyIG1ldGhvZE5hbWVJZGVudGlmaWVyID0gaWRlbnRpZmllckZyb21JZGVudGlm aWVyUmVwKGlkZW50aWZpZXIpOwogCkBAIC02NjIsMTAgKzY1Niw4IEBAIGtlcm5fcmV0dXJuX3Qg V0tQQ0ludm9rZURlZmF1bHQobWFjaF9wb3IKICAgICAgICAgcmV0dXJuIEtFUk5fRkFJTFVSRTsK ICAgICAKICAgICBOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHkqIGluc3RhbmNlUHJveHkgPSBo b3N0UHJveHktPnBsdWdpbkluc3RhbmNlKHBsdWdpbklEKTsKLSAgICBpZiAoIWluc3RhbmNlUHJv eHkpIHsKLSAgICAgICAgX1dLUEhCb29sZWFuQW5kRGF0YVJlcGx5KGhvc3RQcm94eS0+cG9ydCgp LCBwbHVnaW5JRCwgcmVxdWVzdElELCBmYWxzZSwgMCwgMCk7Ci0gICAgICAgIHJldHVybiBLRVJO X1NVQ0NFU1M7Ci0gICAgfQorICAgIGlmICghaW5zdGFuY2VQcm94eSkKKyAgICAgICAgcmV0dXJu IEtFUk5fRkFJTFVSRTsKIAogICAgIFBsdWdpbkRlc3Ryb3lEZWZlcnJlciBkZWZlcnJlcihpbnN0 YW5jZVByb3h5KTsKIApAQCAtNzA4LDE2ICs3MDAsMTIgQEAga2Vybl9yZXR1cm5fdCBXS1BDR2V0 UHJvcGVydHkobWFjaF9wb3J0XwogICAgICAgICByZXR1cm4gS0VSTl9GQUlMVVJFOwogICAgIAog ICAgIE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eSogaW5zdGFuY2VQcm94eSA9IGhvc3RQcm94 eS0+cGx1Z2luSW5zdGFuY2UocGx1Z2luSUQpOwotICAgIGlmICghaW5zdGFuY2VQcm94eSkgewot ICAgICAgICBfV0tQSEJvb2xlYW5BbmREYXRhUmVwbHkoaG9zdFByb3h5LT5wb3J0KCksIHBsdWdp bklELCByZXF1ZXN0SUQsIGZhbHNlLCAwLCAwKTsKLSAgICAgICAgcmV0dXJuIEtFUk5fU1VDQ0VT UzsKLSAgICB9CisgICAgaWYgKCFpbnN0YW5jZVByb3h5KQorICAgICAgICByZXR1cm4gS0VSTl9G QUlMVVJFOwogICAgIAogICAgIElkZW50aWZpZXJSZXAqIGlkZW50aWZpZXIgPSByZWludGVycHJl dF9jYXN0PElkZW50aWZpZXJSZXAqPihzZXJ2ZXJJZGVudGlmaWVyKTsKLSAgICBpZiAoIUlkZW50 aWZpZXJSZXA6OmlzVmFsaWQoaWRlbnRpZmllcikpIHsKLSAgICAgICAgX1dLUEhCb29sZWFuQW5k RGF0YVJlcGx5KGhvc3RQcm94eS0+cG9ydCgpLCBwbHVnaW5JRCwgcmVxdWVzdElELCBmYWxzZSwg MCwgMCk7Ci0gICAgICAgIHJldHVybiBLRVJOX1NVQ0NFU1M7Ci0gICAgfQorICAgIGlmICghSWRl bnRpZmllclJlcDo6aXNWYWxpZChpZGVudGlmaWVyKSkKKyAgICAgICAgcmV0dXJuIEtFUk5fRkFJ TFVSRTsKICAgICAKICAgICBQbHVnaW5EZXN0cm95RGVmZXJyZXIgZGVmZXJyZXIoaW5zdGFuY2VQ cm94eSk7CiAKQEAgLTczOCw3ICs3MjYsNyBAQCBrZXJuX3JldHVybl90IFdLUENHZXRQcm9wZXJ0 eShtYWNoX3BvcnRfCiAgICAgcmV0dXJuIEtFUk5fU1VDQ0VTUzsKIH0KIAota2Vybl9yZXR1cm5f dCBXS1BDU2V0UHJvcGVydHkobWFjaF9wb3J0X3QgY2xpZW50UG9ydCwgdWludDMyX3QgcGx1Z2lu SUQsIHVpbnQzMl90IG9iamVjdElELCB1aW50NjRfdCBzZXJ2ZXJJZGVudGlmaWVyLCBkYXRhX3Qg dmFsdWVEYXRhLCBtYWNoX21zZ190eXBlX251bWJlcl90IHZhbHVlTGVuZ3RoLCBib29sZWFuX3Qq IHJldHVyblZhbHVlKQora2Vybl9yZXR1cm5fdCBXS1BDU2V0UHJvcGVydHkobWFjaF9wb3J0X3Qg Y2xpZW50UG9ydCwgdWludDMyX3QgcGx1Z2luSUQsIHVpbnQzMl90IHJlcXVlc3RJRCwgdWludDMy X3Qgb2JqZWN0SUQsIHVpbnQ2NF90IHNlcnZlcklkZW50aWZpZXIsIGRhdGFfdCB2YWx1ZURhdGEs IG1hY2hfbXNnX3R5cGVfbnVtYmVyX3QgdmFsdWVMZW5ndGgpCiB7CiAgICAgRGF0YURlYWxsb2Nh dG9yIGRlYWxsb2NhdG9yKHZhbHVlRGF0YSwgdmFsdWVMZW5ndGgpOwogCkBAIC03NTQsMTggKzc0 MiwyMSBAQCBrZXJuX3JldHVybl90IFdLUENTZXRQcm9wZXJ0eShtYWNoX3BvcnRfCiAKICAgICBJ ZGVudGlmaWVyUmVwKiBpZGVudGlmaWVyID0gcmVpbnRlcnByZXRfY2FzdDxJZGVudGlmaWVyUmVw Kj4oc2VydmVySWRlbnRpZmllcik7CiAgICAgaWYgKCFJZGVudGlmaWVyUmVwOjppc1ZhbGlkKGlk ZW50aWZpZXIpKQotICAgICAgICAqcmV0dXJuVmFsdWUgPSBmYWxzZTsKLSAgICAKKyAgICAgICAg cmV0dXJuIEtFUk5fRkFJTFVSRTsKKworICAgIGJvb2wgcmVzdWx0OwogICAgIGlmIChpZGVudGlm aWVyLT5pc1N0cmluZygpKSB7CiAgICAgICAgIElkZW50aWZpZXIgcHJvcGVydHlOYW1lSWRlbnRp ZmllciA9IGlkZW50aWZpZXJGcm9tSWRlbnRpZmllclJlcChpZGVudGlmaWVyKTsgICAgICAgIAot ICAgICAgICAqcmV0dXJuVmFsdWUgPSBpbnN0YW5jZVByb3h5LT5zZXRQcm9wZXJ0eShvYmplY3RJ RCwgcHJvcGVydHlOYW1lSWRlbnRpZmllciwgdmFsdWVEYXRhLCB2YWx1ZUxlbmd0aCk7CisgICAg ICAgIHJlc3VsdCA9IGluc3RhbmNlUHJveHktPnNldFByb3BlcnR5KG9iamVjdElELCBwcm9wZXJ0 eU5hbWVJZGVudGlmaWVyLCB2YWx1ZURhdGEsIHZhbHVlTGVuZ3RoKTsKICAgICB9IGVsc2UgCi0g ICAgICAgICpyZXR1cm5WYWx1ZSA9IGluc3RhbmNlUHJveHktPnNldFByb3BlcnR5KG9iamVjdElE LCBpZGVudGlmaWVyLT5udW1iZXIoKSwgdmFsdWVEYXRhLCB2YWx1ZUxlbmd0aCk7Ci0gICAgCisg ICAgICAgIHJlc3VsdCA9IGluc3RhbmNlUHJveHktPnNldFByb3BlcnR5KG9iamVjdElELCBpZGVu dGlmaWVyLT5udW1iZXIoKSwgdmFsdWVEYXRhLCB2YWx1ZUxlbmd0aCk7CisKKyAgICBfV0tQSEJv b2xlYW5SZXBseShob3N0UHJveHktPnBvcnQoKSwgaW5zdGFuY2VQcm94eS0+cGx1Z2luSUQoKSwg cmVxdWVzdElELCByZXN1bHQpOworCiAgICAgcmV0dXJuIEtFUk5fU1VDQ0VTUzsKIH0KIAota2Vy bl9yZXR1cm5fdCBXS1BDUmVtb3ZlUHJvcGVydHkobWFjaF9wb3J0X3QgY2xpZW50UG9ydCwgdWlu dDMyX3QgcGx1Z2luSUQsIHVpbnQzMl90IG9iamVjdElELCB1aW50NjRfdCBzZXJ2ZXJJZGVudGlm aWVyLCBib29sZWFuX3QqIHJldHVyblZhbHVlKQora2Vybl9yZXR1cm5fdCBXS1BDUmVtb3ZlUHJv cGVydHkobWFjaF9wb3J0X3QgY2xpZW50UG9ydCwgdWludDMyX3QgcGx1Z2luSUQsIHVpbnQzMl90 IHJlcXVlc3RJRCwgdWludDMyX3Qgb2JqZWN0SUQsIHVpbnQ2NF90IHNlcnZlcklkZW50aWZpZXIp CiB7CiAgICAgTmV0c2NhcGVQbHVnaW5Ib3N0UHJveHkqIGhvc3RQcm94eSA9IHBsdWdpblByb3h5 TWFwKCkuZ2V0KGNsaWVudFBvcnQpOwogICAgIGlmICghaG9zdFByb3h5KQpAQCAtNzgwLDEzICs3 NzEsMTYgQEAga2Vybl9yZXR1cm5fdCBXS1BDUmVtb3ZlUHJvcGVydHkobWFjaF9wbwogICAgIElk ZW50aWZpZXJSZXAqIGlkZW50aWZpZXIgPSByZWludGVycHJldF9jYXN0PElkZW50aWZpZXJSZXAq PihzZXJ2ZXJJZGVudGlmaWVyKTsKICAgICBpZiAoIUlkZW50aWZpZXJSZXA6OmlzVmFsaWQoaWRl bnRpZmllcikpCiAgICAgICAgIHJldHVybiBLRVJOX0ZBSUxVUkU7Ci0gICAgICAgIAorCisgICAg Ym9vbCByZXN1bHQ7CiAgICAgaWYgKGlkZW50aWZpZXItPmlzU3RyaW5nKCkpIHsKICAgICAgICAg SWRlbnRpZmllciBwcm9wZXJ0eU5hbWVJZGVudGlmaWVyID0gaWRlbnRpZmllckZyb21JZGVudGlm aWVyUmVwKGlkZW50aWZpZXIpOyAgICAgICAgCi0gICAgICAgICpyZXR1cm5WYWx1ZSA9IGluc3Rh bmNlUHJveHktPnJlbW92ZVByb3BlcnR5KG9iamVjdElELCBwcm9wZXJ0eU5hbWVJZGVudGlmaWVy KTsKKyAgICAgICAgcmVzdWx0ID0gaW5zdGFuY2VQcm94eS0+cmVtb3ZlUHJvcGVydHkob2JqZWN0 SUQsIHByb3BlcnR5TmFtZUlkZW50aWZpZXIpOwogICAgIH0gZWxzZSAKLSAgICAgICAgKnJldHVy blZhbHVlID0gaW5zdGFuY2VQcm94eS0+cmVtb3ZlUHJvcGVydHkob2JqZWN0SUQsIGlkZW50aWZp ZXItPm51bWJlcigpKTsKLSAgICAKKyAgICAgICAgcmVzdWx0ID0gaW5zdGFuY2VQcm94eS0+cmVt b3ZlUHJvcGVydHkob2JqZWN0SUQsIGlkZW50aWZpZXItPm51bWJlcigpKTsKKworICAgIF9XS1BI Qm9vbGVhblJlcGx5KGhvc3RQcm94eS0+cG9ydCgpLCBpbnN0YW5jZVByb3h5LT5wbHVnaW5JRCgp LCByZXF1ZXN0SUQsIHJlc3VsdCk7CisKICAgICByZXR1cm4gS0VSTl9TVUNDRVNTOwogfQogCkBA IC03OTcsMTggKzc5MSwxNCBAQCBrZXJuX3JldHVybl90IFdLUENIYXNQcm9wZXJ0eShtYWNoX3Bv cnRfCiAgICAgICAgIHJldHVybiBLRVJOX0ZBSUxVUkU7CiAgICAgCiAgICAgTmV0c2NhcGVQbHVn aW5JbnN0YW5jZVByb3h5KiBpbnN0YW5jZVByb3h5ID0gaG9zdFByb3h5LT5wbHVnaW5JbnN0YW5j ZShwbHVnaW5JRCk7Ci0gICAgaWYgKCFpbnN0YW5jZVByb3h5KSB7Ci0gICAgICAgIF9XS1BIQm9v bGVhblJlcGx5KGhvc3RQcm94eS0+cG9ydCgpLCBwbHVnaW5JRCwgcmVxdWVzdElELCBmYWxzZSk7 Ci0gICAgICAgIHJldHVybiBLRVJOX1NVQ0NFU1M7Ci0gICAgfQorICAgIGlmICghaW5zdGFuY2VQ cm94eSkKKyAgICAgICAgcmV0dXJuIEtFUk5fRkFJTFVSRTsKICAgICAKICAgICBQbHVnaW5EZXN0 cm95RGVmZXJyZXIgZGVmZXJyZXIoaW5zdGFuY2VQcm94eSk7CiAKICAgICBJZGVudGlmaWVyUmVw KiBpZGVudGlmaWVyID0gcmVpbnRlcnByZXRfY2FzdDxJZGVudGlmaWVyUmVwKj4oc2VydmVySWRl bnRpZmllcik7Ci0gICAgaWYgKCFJZGVudGlmaWVyUmVwOjppc1ZhbGlkKGlkZW50aWZpZXIpKSB7 Ci0gICAgICAgIF9XS1BIQm9vbGVhblJlcGx5KGhvc3RQcm94eS0+cG9ydCgpLCBpbnN0YW5jZVBy b3h5LT5wbHVnaW5JRCgpLCByZXF1ZXN0SUQsIGZhbHNlKTsKLSAgICAgICAgcmV0dXJuIEtFUk5f U1VDQ0VTUzsKLSAgICB9ICAgIAorICAgIGlmICghSWRlbnRpZmllclJlcDo6aXNWYWxpZChpZGVu dGlmaWVyKSkKKyAgICAgICAgcmV0dXJuIEtFUk5fRkFJTFVSRTsKICAgICAKICAgICBib29sZWFu X3QgcmV0dXJuVmFsdWU7CiAgICAgaWYgKGlkZW50aWZpZXItPmlzU3RyaW5nKCkpIHsKQEAgLTgy OSwxOCArODE5LDE0IEBAIGtlcm5fcmV0dXJuX3QgV0tQQ0hhc01ldGhvZChtYWNoX3BvcnRfdCAK ICAgICAgICAgcmV0dXJuIEtFUk5fRkFJTFVSRTsKICAgICAKICAgICBOZXRzY2FwZVBsdWdpbklu c3RhbmNlUHJveHkqIGluc3RhbmNlUHJveHkgPSBob3N0UHJveHktPnBsdWdpbkluc3RhbmNlKHBs dWdpbklEKTsKLSAgICBpZiAoIWluc3RhbmNlUHJveHkpIHsKLSAgICAgICAgX1dLUEhCb29sZWFu UmVwbHkoaG9zdFByb3h5LT5wb3J0KCksIHBsdWdpbklELCByZXF1ZXN0SUQsIGZhbHNlKTsKLSAg ICAgICAgcmV0dXJuIEtFUk5fU1VDQ0VTUzsKLSAgICB9CisgICAgaWYgKCFpbnN0YW5jZVByb3h5 KQorICAgICAgICByZXR1cm4gS0VSTl9GQUlMVVJFOwogICAgIAogICAgIFBsdWdpbkRlc3Ryb3lE ZWZlcnJlciBkZWZlcnJlcihpbnN0YW5jZVByb3h5KTsKIAogICAgIElkZW50aWZpZXJSZXAqIGlk ZW50aWZpZXIgPSByZWludGVycHJldF9jYXN0PElkZW50aWZpZXJSZXAqPihzZXJ2ZXJJZGVudGlm aWVyKTsKLSAgICBpZiAoIUlkZW50aWZpZXJSZXA6OmlzVmFsaWQoaWRlbnRpZmllcikpIHsKLSAg ICAgICAgX1dLUEhCb29sZWFuUmVwbHkoaG9zdFByb3h5LT5wb3J0KCksIGluc3RhbmNlUHJveHkt PnBsdWdpbklEKCksIHJlcXVlc3RJRCwgZmFsc2UpOwotICAgICAgICByZXR1cm4gS0VSTl9TVUND RVNTOwotICAgIH0KKyAgICBpZiAoIUlkZW50aWZpZXJSZXA6OmlzVmFsaWQoaWRlbnRpZmllcikp CisgICAgICAgIHJldHVybiBLRVJOX0ZBSUxVUkU7CiAgICAgCiAgICAgSWRlbnRpZmllciBtZXRo b2ROYW1lSWRlbnRpZmllciA9IGlkZW50aWZpZXJGcm9tSWRlbnRpZmllclJlcChpZGVudGlmaWVy KTsgICAgICAgIAogICAgIGJvb2xlYW5fdCByZXR1cm5WYWx1ZSA9IGluc3RhbmNlUHJveHktPmhh c01ldGhvZChvYmplY3RJRCwgbWV0aG9kTmFtZUlkZW50aWZpZXIpOwpAQCAtODgxLDEwICs4Njcs OCBAQCBrZXJuX3JldHVybl90IFdLUENFbnVtZXJhdGUobWFjaF9wb3J0X3QgCiAgICAgICAgIHJl dHVybiBLRVJOX0ZBSUxVUkU7CiAgICAgCiAgICAgTmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5 KiBpbnN0YW5jZVByb3h5ID0gaG9zdFByb3h5LT5wbHVnaW5JbnN0YW5jZShwbHVnaW5JRCk7Ci0g ICAgaWYgKCFpbnN0YW5jZVByb3h5KSB7Ci0gICAgICAgIF9XS1BIQm9vbGVhbkFuZERhdGFSZXBs eShob3N0UHJveHktPnBvcnQoKSwgcGx1Z2luSUQsIHJlcXVlc3RJRCwgZmFsc2UsIDAsIDApOwot ICAgICAgICByZXR1cm4gS0VSTl9TVUNDRVNTOwotICAgIH0KKyAgICBpZiAoIWluc3RhbmNlUHJv eHkpCisgICAgICAgIHJldHVybiBLRVJOX0ZBSUxVUkU7CiAgICAgCiAgICAgZGF0YV90IHJlc3Vs dERhdGEgPSAwOwogICAgIG1hY2hfbXNnX3R5cGVfbnVtYmVyX3QgcmVzdWx0TGVuZ3RoID0gMDsK SW5kZXg6IFdlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQvV2ViS2l0UGx1Z2luQ2xpZW50LmRlZnMK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9XZWJLaXRQbHVnaW5DbGll bnQuZGVmcwkocmV2aXNpb24gNTQ1MDQpCisrKyBXZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL1dl YktpdFBsdWdpbkNsaWVudC5kZWZzCSh3b3JraW5nIGNvcHkpCkBAIC0xNDksMTggKzE0OSwxOCBA QCBzaW1wbGVyb3V0aW5lIFBDR2V0UHJvcGVydHkoY2xpZW50UG9ydCA6CiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgb2JqZWN0SUQgOnVpbnQzMl90OwogICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHByb3BlcnR5TmFtZUlkZW50aWZpZXIgOnVpbnQ2NF90KTsKIAotcm91dGluZSBQQ1Nl dFByb3BlcnR5KGNsaWVudFBvcnQgOm1hY2hfcG9ydF90Oworc2ltcGxlcm91dGluZSBQQ1NldFBy b3BlcnR5KGNsaWVudFBvcnQgOm1hY2hfcG9ydF90OwogICAgICAgICAgICAgICAgICAgICBwbHVn aW5JRCA6dWludDMyX3Q7CisgICAgICAgICAgICAgICAgICAgIHJlcXVlc3RJRCA6dWludDMyX3Q7 CiAgICAgICAgICAgICAgICAgICAgIG9iamVjdElEIDp1aW50MzJfdDsKICAgICAgICAgICAgICAg ICAgICAgcHJvcGVydHlOYW1lSWRlbnRpZmllciA6dWludDY0X3Q7Ci0gICAgICAgICAgICAgICAg ICAgIHZhbHVlIDpkYXRhX3Q7Ci0gICAgICAgICAgICAgICAgICAgIG91dCByZXR1cm5WYWx1ZSA6 Ym9vbGVhbl90KTsKKyAgICAgICAgICAgICAgICAgICAgdmFsdWUgOmRhdGFfdCk7CiAKLXJvdXRp bmUgUENSZW1vdmVQcm9wZXJ0eShjbGllbnRQb3J0IDptYWNoX3BvcnRfdDsKK3NpbXBsZXJvdXRp bmUgUENSZW1vdmVQcm9wZXJ0eShjbGllbnRQb3J0IDptYWNoX3BvcnRfdDsKICAgICAgICAgICAg ICAgICAgICAgICAgcGx1Z2luSUQgOnVpbnQzMl90OworICAgICAgICAgICAgICAgICAgICAgICBy ZXF1ZXN0SUQgOnVpbnQzMl90OwogICAgICAgICAgICAgICAgICAgICAgICBvYmplY3RJRCA6dWlu dDMyX3Q7Ci0gICAgICAgICAgICAgICAgICAgICAgIHByb3BlcnR5TmFtZUlkZW50aWZpZXIgOnVp bnQ2NF90OwotICAgICAgICAgICAgICAgICAgICAgICBvdXQgcmV0dXJuVmFsdWUgOmJvb2xlYW5f dCk7CisgICAgICAgICAgICAgICAgICAgICAgIHByb3BlcnR5TmFtZUlkZW50aWZpZXIgOnVpbnQ2 NF90KTsKIAogc2ltcGxlcm91dGluZSBQQ0hhc1Byb3BlcnR5KGNsaWVudFBvcnQgOm1hY2hfcG9y dF90OwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBsdWdpbklEIDp1aW50MzJfdDsKSW5k ZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9DaGFu Z2VMb2cJKHJldmlzaW9uIDU0NTExKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDItMDggIEFsZXhleSBQcm9za3VyeWFrb3Yg IDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0NzI3Cisg ICAgICAgIEFzc2VydGlvbiBjcmFzaGVzIGFuZCBmcmVlemVzIHdoZW4gcGx1Zy1pbiBwcm9wZXJ0 eSBhY2Nlc3MgcmVzdWx0cyBpbiBhbiBleGNlcHRpb24KKworICAgICAgICAqIER1bXBSZW5kZXJU cmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi5zdWJwcm9qL1BsdWdpbk9iamVjdC5jcHA6CisgICAgICAg IChwbHVnaW5HZXRQcm9wZXJ0eSk6IFJhaXNlIGFuIGV4Y2VwdGlvbiB3aGVuIGFjY2Vzc2luZyBh IHBhcnRpY3VsYXIgcHJvcGVydHkuCisgICAgICAgIChwbHVnaW5TZXRQcm9wZXJ0eSk6IERpdHRv LgorICAgICAgICAocGx1Z2luSW52b2tlKTogQWRkZWQgbWV0aG9kcyB0byBnZXQgYW5kIHNldCBo b3N0IG9iamVjdCBwcm9wZXJ0aWVzLgorCiAyMDEwLTAyLTA4ICBLZW5uZXRoIFJvaGRlIENocmlz dGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBUb3Ig QXJuZSBWZXN0YsO4LgpJbmRleDogV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNj YXBlUGx1Z0luLnN1YnByb2ovUGx1Z2luT2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRU b29scy9EdW1wUmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4uc3VicHJvai9QbHVnaW5PYmpl Y3QuY3BwCShyZXZpc2lvbiA1NDQ2MikKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL1Rl c3ROZXRzY2FwZVBsdWdJbi5zdWJwcm9qL1BsdWdpbk9iamVjdC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTEzMyw2ICsxMzMsNyBAQCBlbnVtIHsKICAgICBJRF9QUk9QRVJUWV9SRVRVUk5fRVJST1Jf RlJPTV9ORVdTVFJFQU0sCiAgICAgSURfUFJPUEVSVFlfUFJJVkFURV9CUk9XU0lOR19FTkFCTEVE LAogICAgIElEX1BST1BFUlRZX0NBQ0hFRF9QUklWQVRFX0JST1dTSU5HX0VOQUJMRUQsCisgICAg SURfUFJPUEVSVFlfVEhST1dfRVhDRVBUSU9OX1BST1BFUlRZLAogICAgIE5VTV9QUk9QRVJUWV9J REVOVElGSUVSUwogfTsKIApAQCAtMTQ2LDYgKzE0Nyw3IEBAIHN0YXRpYyBjb25zdCBOUFVURjgg KnBsdWdpblByb3BlcnR5SWRlbnQKICAgICAicmV0dXJuRXJyb3JGcm9tTmV3U3RyZWFtIiwKICAg ICAicHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCIsCiAgICAgImNhY2hlZFByaXZhdGVCcm93c2luZ0Vu YWJsZWQiLAorICAgICJ0ZXN0VGhyb3dFeGNlcHRpb25Qcm9wZXJ0eSIKIH07CiAKIGVudW0gewpA QCAtMTcyLDYgKzE3NCw4IEBAIGVudW0gewogICAgIElEX0RFU1RST1lfTlVMTF9TVFJFQU0sCiAg ICAgSURfVEVTVF9SRUxPQURfUExVR0lOU19OT19QQUdFUywKICAgICBJRF9URVNUX1JFTE9BRF9Q TFVHSU5TX0FORF9QQUdFUywKKyAgICBJRF9URVNUX0dFVF9CUk9XU0VSX1BST1BFUlRZLAorICAg IElEX1RFU1RfU0VUX0JST1dTRVJfUFJPUEVSVFksCiAgICAgTlVNX01FVEhPRF9JREVOVElGSUVS UwogfTsKIApAQCAtMTk5LDcgKzIwMyw5IEBAIHN0YXRpYyBjb25zdCBOUFVURjggKnBsdWdpbk1l dGhvZElkZW50aWYKICAgICAidGVzdEZhaWwiLAogICAgICJkZXN0cm95TnVsbFN0cmVhbSIsCiAg ICAgInJlbG9hZFBsdWdpbnNOb1BhZ2VzIiwKLSAgICAicmVsb2FkUGx1Z2luc0FuZFBhZ2VzIgor ICAgICJyZWxvYWRQbHVnaW5zQW5kUGFnZXMiLAorICAgICJ0ZXN0R2V0QnJvd3NlclByb3BlcnR5 IiwKKyAgICAidGVzdFNldEJyb3dzZXJQcm9wZXJ0eSIKIH07CiAKIHN0YXRpYyBOUFVURjgqIGNy ZWF0ZUNTdHJpbmdGcm9tTlBWYXJpYW50KGNvbnN0IE5QVmFyaWFudCogdmFyaWFudCkKQEAgLTI2 NCw2ICsyNzAsOSBAQCBzdGF0aWMgYm9vbCBwbHVnaW5HZXRQcm9wZXJ0eShOUE9iamVjdCogCiAg ICAgfSBlbHNlIGlmIChuYW1lID09IHBsdWdpblByb3BlcnR5SWRlbnRpZmllcnNbSURfUFJPUEVS VFlfQ0FDSEVEX1BSSVZBVEVfQlJPV1NJTkdfRU5BQkxFRF0pIHsKICAgICAgICAgQk9PTEVBTl9U T19OUFZBUklBTlQocGx1Z2luLT5jYWNoZWRQcml2YXRlQnJvd3NpbmdNb2RlLCAqcmVzdWx0KTsK ICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfSBlbHNlIGlmIChuYW1lID09IHBsdWdpblByb3Bl cnR5SWRlbnRpZmllcnNbSURfUFJPUEVSVFlfVEhST1dfRVhDRVBUSU9OX1BST1BFUlRZXSkgewor ICAgICAgICBicm93c2VyLT5zZXRleGNlcHRpb24ob2JqLCAicGx1Z2luIG9iamVjdCB0ZXN0VGhy b3dFeGNlcHRpb25Qcm9wZXJ0eSBTVUNDRVNTIik7CisgICAgICAgIHJldHVybiB0cnVlOwogICAg IH0KICAgICByZXR1cm4gZmFsc2U7CiB9CkBAIC0yODAsNiArMjg5LDkgQEAgc3RhdGljIGJvb2wg cGx1Z2luU2V0UHJvcGVydHkoTlBPYmplY3QqIAogICAgIH0gZWxzZSBpZiAobmFtZSA9PSBwbHVn aW5Qcm9wZXJ0eUlkZW50aWZpZXJzW0lEX1BST1BFUlRZX1JFVFVSTl9FUlJPUl9GUk9NX05FV1NU UkVBTV0pIHsKICAgICAgICAgcGx1Z2luLT5yZXR1cm5FcnJvckZyb21OZXdTdHJlYW0gPSBOUFZB UklBTlRfVE9fQk9PTEVBTigqdmFyaWFudCk7CiAgICAgICAgIHJldHVybiB0cnVlOworICAgIH0g ZWxzZSBpZiAobmFtZSA9PSBwbHVnaW5Qcm9wZXJ0eUlkZW50aWZpZXJzW0lEX1BST1BFUlRZX1RI Uk9XX0VYQ0VQVElPTl9QUk9QRVJUWV0pIHsKKyAgICAgICAgYnJvd3Nlci0+c2V0ZXhjZXB0aW9u KG9iaiwgInBsdWdpbiBvYmplY3QgdGVzdFRocm93RXhjZXB0aW9uUHJvcGVydHkgU1VDQ0VTUyIp OworICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKICAgICByZXR1cm4gZmFsc2U7CkBAIC03 ODksNiArODAxLDEyIEBAIHN0YXRpYyBib29sIHBsdWdpbkludm9rZShOUE9iamVjdCogaGVhZGUK ICAgICB9IGVsc2UgaWYgKG5hbWUgPT0gcGx1Z2luTWV0aG9kSWRlbnRpZmllcnNbSURfVEVTVF9S RUxPQURfUExVR0lOU19BTkRfUEFHRVNdKSB7CiAgICAgICAgIGJyb3dzZXItPnJlbG9hZHBsdWdp bnModHJ1ZSk7CiAgICAgICAgIHJldHVybiB0cnVlOworICAgIH0gZWxzZSBpZiAobmFtZSA9PSBw bHVnaW5NZXRob2RJZGVudGlmaWVyc1tJRF9URVNUX0dFVF9CUk9XU0VSX1BST1BFUlRZXSkgewor ICAgICAgICBicm93c2VyLT5nZXRwcm9wZXJ0eShwbHVnaW4tPm5wcCwgTlBWQVJJQU5UX1RPX09C SkVDVChhcmdzWzBdKSwgc3RyaW5nVmFyaWFudFRvSWRlbnRpZmllcihhcmdzWzFdKSwgcmVzdWx0 KTsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfSBlbHNlIGlmIChuYW1lID09IHBsdWdpbk1l dGhvZElkZW50aWZpZXJzW0lEX1RFU1RfU0VUX0JST1dTRVJfUFJPUEVSVFldKSB7CisgICAgICAg IGJyb3dzZXItPnNldHByb3BlcnR5KHBsdWdpbi0+bnBwLCBOUFZBUklBTlRfVE9fT0JKRUNUKGFy Z3NbMF0pLCBzdHJpbmdWYXJpYW50VG9JZGVudGlmaWVyKGFyZ3NbMV0pLCAmYXJnc1syXSk7Cisg ICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KICAgICAKICAgICByZXR1cm4gZmFsc2U7CkluZGV4 OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCShyZXZpc2lvbiA1NDUxMSkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBj b3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEwLTAyLTA4ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8 YXBAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDcyNworICAg ICAgICBBc3NlcnRpb24gY3Jhc2hlcyBhbmQgZnJlZXplcyB3aGVuIHBsdWctaW4gcHJvcGVydHkg YWNjZXNzIHJlc3VsdHMgaW4gYW4gZXhjZXB0aW9uCisKKyAgICAgICAgKiBwbHVnaW5zL25ldHNj YXBlLXBsdWdpbi1wcm9wZXJ0eS1hY2Nlc3MtZXhjZXB0aW9uLWV4cGVjdGVkLnR4dDogQWRkZWQu CisgICAgICAgICogcGx1Z2lucy9uZXRzY2FwZS1wbHVnaW4tcHJvcGVydHktYWNjZXNzLWV4Y2Vw dGlvbi5odG1sOiBBZGRlZC4KKyAgICAgICAgVGhlIHRlc3QgZXhwZWN0YXRpb25zIGFyZSBhIGNv bXByb21pc2UgYmV0d2VlbiBjb21tb24gc2Vuc2UgYW5kIEZpcmVmb3ggYmVoYXZpb3IuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9tYWMtc25vd2xlb3BhcmQvU2tpcHBlZDogSW4gT09QIGNhc2UsIHRo aXMgdGVzdCBuZWVkcyBuZXdlciBTYWZhcmkuCisKIDIwMTAtMDItMDggIEFsZXhleSBQcm9za3Vy eWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgUHV0IHRoZSB0ZXN0IGJhY2sgb24gc2tp cHBlZCBsaXN0IC0gaXQgbmVlZHMgYSBuZXdlciB2ZXJzaW9uIG9mIFNhZmFyaSB0byBwYXNzLgpJ bmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXNub3dsZW9wYXJkL1NraXBwZWQKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXNub3dsZW9wYXJkL1NraXBwZWQJKHJl dmlzaW9uIDU0NTA3KQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXNub3dsZW9wYXJkL1Nr aXBwZWQJKHdvcmtpbmcgY29weSkKQEAgLTgsNiArOCw3IEBAIHBsdWdpbnMvbW91c2UtZXZlbnRz Lmh0bWwKIAogIyBUaGVzZSBuZWVkIGEgbmV3ZXIgdmVyc2lvbiBvZiBTYWZhcmkuCiBwbHVnaW5z L3ByaXZhdGUtYnJvd3NpbmctbW9kZS5odG1sCitwbHVnaW5zL25ldHNjYXBlLXBsdWdpbi1wcm9w ZXJ0eS1hY2Nlc3MtZXhjZXB0aW9uLmh0bWwKIHBsdWdpbnMvbmV0c2NhcGUtdGhyb3ctZXhjZXB0 aW9uLmh0bWwKIAogIyBSYWRhciBidWdzIG5lZWRlZCBmb3IgdGhlc2UK