60886 2011-05-16 08:05:12 -0700 Add the ability for a plug-in controller to short-circuit calls to NPN_Invoke 2011-05-16 08:11:51 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 404475 0 andersca 2011-05-16 08:05:12 -0700 Add the ability for a plug-in controller to short-circuit calls to NPN_Invoke 404477 1 93643 andersca 2011-05-16 08:08:55 -0700 Created attachment 93643 Patch 404479 2 93643 aroben 2011-05-16 08:10:57 -0700 Comment on attachment 93643 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=93643&action=review > Source/WebKit2/PluginProcess/PluginControllerProxy.cpp:284 > +bool PluginControllerProxy::tryToShortCircuitInvoke(NPObject*, NPIdentifier methodName, const NPVariant* arguments, uint32_t argumentCount, NPVariant* result) Will these unused variables be a problem? > Source/WebKit2/PluginProcess/PluginControllerProxy.cpp:543 > +bool PluginControllerProxy::tryToShortCircuitEvaluate(NPObject* npObject, const String& scriptString, NPVariant* result) Will these unused variables be a problem? 404482 3 andersca 2011-05-16 08:11:51 -0700 Committed r86573: <http://trac.webkit.org/changeset/86573> 93643 2011-05-16 08:08:55 -0700 2011-05-16 08:10:57 -0700 Patch bug-60886-20110516080855.patch text/plain 9221 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2NTcyKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTEtMDUtMTYgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgdGhlIGFiaWxpdHkgZm9yIGEgcGx1Zy1pbiBjb250 cm9sbGVyIHRvIHNob3J0LWNpcmN1aXQgY2FsbHMgdG8gTlBOX0ludm9rZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjA4ODYKKworICAgICAgICBNYWtl IGl0IHBvc3NpYmxlIGZvciBhIHBsdWctaW4gY29udHJvbGxlciB0byBpbnRlcmNlcHQgY2FsbHMg dG8gTlBOX0ludm9rZSwgd2hpY2gKKyAgICAgICAgd2lsbCBiZSB1c2VmdWwgZm9yIGF2b2lkaW5n IHN5bmMgSVBDIG1lc3NhZ2VzIGR1cmluZyBpbnN0YW50aWF0aW9uLgorCisgICAgICAgICogUGx1 Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpQ bHVnaW5Db250cm9sbGVyUHJveHk6OmV2YWx1YXRlKToKKyAgICAgICAgQ2FsbCB0cnlUb1Nob3J0 Q2lyY3VpdEV2YWx1YXRlLiBJZiBpdCByZXR1cm5zIHRydWUsIHdlIGRvbid0IG5lZWQgdG8gY2Fs bCBiYWNrIHRvCisgICAgICAgIHRoZSB3ZWIgcHJvY2VzcyB0byBhc2sgaXQgdG8gZXZhbHVhdGUg dGhlIHNjcmlwdCBzdHJpbmcuCisKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luQ29udHJvbGxlclBy b3h5Ojp0cnlUb1Nob3J0Q2lyY3VpdEludm9rZSk6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpbkNv bnRyb2xsZXJQcm94eTo6dHJ5VG9TaG9ydENpcmN1aXRFdmFsdWF0ZSk6CisgICAgICAgIEFsd2F5 cyByZXR1cm4gZmFsc2UgZm9yIG5vdy4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9O ZXRzY2FwZS9OZXRzY2FwZUJyb3dzZXJGdW5jcy5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5QTl9J bnZva2UpOgorICAgICAgICBHZXQgdGhlIHBsdWctaW4gYW5kIGNhbGwgdHJ5VG9TaG9ydENpcmN1 aXRJbnZva2UuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2Nh cGVQbHVnaW4uY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6dHJ5VG9TaG9y dENpcmN1aXRJbnZva2UpOgorICAgICAgICBDYWxsIHRoZSBwbHVnLWluIGNvbnRyb2xsZXIuCisK KyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHA6CisgICAgICAgIChX ZWJLaXQ6OlBsdWdpblZpZXc6OnRyeVRvU2hvcnRDaXJjdWl0SW52b2tlKToKKyAgICAgICAgQWx3 YXlzIHJldHVybiBmYWxzZSBoZXJlLCBzaW5jZSB0aGVyZSdzIG5vIG5lZWQgdG8gc2hvcnQtY2ly Y3VpdCBjYWxscworICAgICAgICBmb3IgcGx1Zy1pbnMgdGhhdCBsaXZlIGluIHRoZSB3ZWIgcHJv Y2Vzcy4KKwogMjAxMS0wNS0xNiAgU2lkZGhhcnRoIE1hdGh1ciAgPHNpZGRoYXJ0aC5tYXRodXJA bm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IExhc3psbyBHb21ib3MuCkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94eS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVy UHJveHkuY3BwCShyZXZpc2lvbiA4NjUyMikKKysrIFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nl c3MvUGx1Z2luQ29udHJvbGxlclByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjU3LDYgKzI1 Nyw5IEBAIE5QT2JqZWN0KiBQbHVnaW5Db250cm9sbGVyUHJveHk6OnBsdWdpbkUKIAogYm9vbCBQ bHVnaW5Db250cm9sbGVyUHJveHk6OmV2YWx1YXRlKE5QT2JqZWN0KiBucE9iamVjdCwgY29uc3Qg U3RyaW5nJiBzY3JpcHRTdHJpbmcsIE5QVmFyaWFudCogcmVzdWx0LCBib29sIGFsbG93UG9wdXBz KQogeworICAgIGlmICh0cnlUb1Nob3J0Q2lyY3VpdEV2YWx1YXRlKG5wT2JqZWN0LCBzY3JpcHRT dHJpbmcsIHJlc3VsdCkpCisgICAgICAgIHJldHVybiB0cnVlOworCiAgICAgUGx1Z2luRGVzdHJ1 Y3Rpb25Qcm90ZWN0b3IgcHJvdGVjdG9yKHRoaXMpOwogCiAgICAgTlBWYXJpYW50IG5wT2JqZWN0 QXNOUFZhcmlhbnQ7CkBAIC0yNzgsNiArMjgxLDExIEBAIGJvb2wgUGx1Z2luQ29udHJvbGxlclBy b3h5OjpldmFsdWF0ZShOUE8KICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorYm9vbCBQbHVnaW5Db250 cm9sbGVyUHJveHk6OnRyeVRvU2hvcnRDaXJjdWl0SW52b2tlKE5QT2JqZWN0KiwgTlBJZGVudGlm aWVyIG1ldGhvZE5hbWUsIGNvbnN0IE5QVmFyaWFudCogYXJndW1lbnRzLCB1aW50MzJfdCBhcmd1 bWVudENvdW50LCBOUFZhcmlhbnQqIHJlc3VsdCkKK3sKKyAgICByZXR1cm4gZmFsc2U7Cit9CisK IHZvaWQgUGx1Z2luQ29udHJvbGxlclByb3h5OjpzZXRTdGF0dXNiYXJUZXh0KGNvbnN0IFN0cmlu ZyYgc3RhdHVzYmFyVGV4dCkKIHsKICAgICBtX2Nvbm5lY3Rpb24tPmNvbm5lY3Rpb24oKS0+c2Vu ZChNZXNzYWdlczo6UGx1Z2luUHJveHk6OlNldFN0YXR1c2JhclRleHQoc3RhdHVzYmFyVGV4dCks IG1fcGx1Z2luSW5zdGFuY2VJRCk7CkBAIC01MzIsNiArNTQwLDExIEBAIHZvaWQgUGx1Z2luQ29u dHJvbGxlclByb3h5Ojpwcml2YXRlQnJvd3MKICAgICBtX3BsdWdpbi0+cHJpdmF0ZUJyb3dzaW5n U3RhdGVDaGFuZ2VkKGlzUHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCk7CiB9CiAKK2Jvb2wgUGx1Z2lu Q29udHJvbGxlclByb3h5Ojp0cnlUb1Nob3J0Q2lyY3VpdEV2YWx1YXRlKE5QT2JqZWN0KiBucE9i amVjdCwgY29uc3QgU3RyaW5nJiBzY3JpcHRTdHJpbmcsIE5QVmFyaWFudCogcmVzdWx0KQorewor ICAgIHJldHVybiBmYWxzZTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICNlbmRpZiAv LyBFTkFCTEUoUExVR0lOX1BST0NFU1MpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9j ZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1BsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxlclByb3h5LmgJKHJldmlzaW9uIDg2NTIyKQor KysgU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkuaAko d29ya2luZyBjb3B5KQpAQCAtODksNiArODksNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgTlBP YmplY3QqIHdpbmRvd1NjcmlwdE5QT2JqZWN0KCk7CiAgICAgdmlydHVhbCBOUE9iamVjdCogcGx1 Z2luRWxlbWVudE5QT2JqZWN0KCk7CiAgICAgdmlydHVhbCBib29sIGV2YWx1YXRlKE5QT2JqZWN0 KiwgY29uc3QgU3RyaW5nJiBzY3JpcHRTdHJpbmcsIE5QVmFyaWFudCogcmVzdWx0LCBib29sIGFs bG93UG9wdXBzKTsKKyAgICB2aXJ0dWFsIGJvb2wgdHJ5VG9TaG9ydENpcmN1aXRJbnZva2UoTlBP YmplY3QqLCBOUElkZW50aWZpZXIgbWV0aG9kTmFtZSwgY29uc3QgTlBWYXJpYW50KiBhcmd1bWVu dHMsIHVpbnQzMl90IGFyZ3VtZW50Q291bnQsIE5QVmFyaWFudCogcmVzdWx0KTsKICAgICB2aXJ0 dWFsIHZvaWQgc2V0U3RhdHVzYmFyVGV4dChjb25zdCBTdHJpbmcmKTsKICAgICB2aXJ0dWFsIGJv b2wgaXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCgpOwogICAgIHZpcnR1YWwgdm9pZCBw bHVnaW5Qcm9jZXNzQ3Jhc2hlZCgpOwpAQCAtMTQwLDYgKzE0MSw4IEBAIHByaXZhdGU6CiAKICAg ICB2b2lkIHByaXZhdGVCcm93c2luZ1N0YXRlQ2hhbmdlZChib29sKTsKIAorICAgIGJvb2wgdHJ5 VG9TaG9ydENpcmN1aXRFdmFsdWF0ZShOUE9iamVjdCosIGNvbnN0IFN0cmluZyYgc2NyaXB0U3Ry aW5nLCBOUFZhcmlhbnQqIHJlc3VsdCk7CisKICAgICB2b2lkIHBsYXRmb3JtSW5pdGlhbGl6ZSgp OwogICAgIHZvaWQgcGxhdGZvcm1EZXN0cm95KCk7CiAgICAgdm9pZCBwbGF0Zm9ybUdlb21ldHJ5 RGlkQ2hhbmdlKCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1 Z2luQ29udHJvbGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9QbHVnaW5Db250cm9sbGVyLmgJKHJldmlzaW9uIDg2NTE0KQorKysgU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkNvbnRyb2xsZXIuaAkod29ya2luZyBjb3B5 KQpAQCAtMzAsNiArMzAsNyBAQAogCiBzdHJ1Y3QgTlBPYmplY3Q7CiB0eXBlZGVmIHN0cnVjdCBf TlBWYXJpYW50IE5QVmFyaWFudDsKK3R5cGVkZWYgdm9pZCogTlBJZGVudGlmaWVyOwogCiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAgICAgY2xhc3MgSFRUUEhlYWRlck1hcDsKQEAgLTgwLDYgKzgxLDkg QEAgcHVibGljOgogICAgIC8vIEV2YWx1YXRlcyB0aGUgZ2l2ZW4gc2NyaXB0IHN0cmluZyBpbiB0 aGUgY29udGV4dCBvZiB0aGUgZ2l2ZW4gTlBPYmplY3QuCiAgICAgdmlydHVhbCBib29sIGV2YWx1 YXRlKE5QT2JqZWN0KiwgY29uc3QgU3RyaW5nJiBzY3JpcHRTdHJpbmcsIE5QVmFyaWFudCogcmVz dWx0LCBib29sIGFsbG93UG9wdXBzKSA9IDA7CiAKKyAgICAvLyBUcmllcyB0byBzaG9ydCBjaXJj dWl0IHRoZSBOUE5fSW52b2tlIGNhbGwgd2l0aCB0aGUgZ2l2ZW4gcGFyYW1ldGVycy4gUmV0dXJu cyB0cnVlIG9uIHN1Y2Nlc3MuCisgICAgdmlydHVhbCBib29sIHRyeVRvU2hvcnRDaXJjdWl0SW52 b2tlKE5QT2JqZWN0KiwgTlBJZGVudGlmaWVyIG1ldGhvZE5hbWUsIGNvbnN0IE5QVmFyaWFudCog YXJndW1lbnRzLCB1aW50MzJfdCBhcmd1bWVudENvdW50LCBOUFZhcmlhbnQqIHJlc3VsdCkgPSAw OworCiAgICAgLy8gU2V0IHRoZSBzdGF0dXNiYXIgdGV4dC4KICAgICB2aXJ0dWFsIHZvaWQgc2V0 U3RhdHVzYmFyVGV4dChjb25zdCBTdHJpbmcmKSA9IDA7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAJKHJldmlzaW9uIDg2NTE0 KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC05OTEsNiArOTkxLDEyIEBAIGJvb2wgUGx1Z2luVmlldzo6ZXZhbHVh dGUoTlBPYmplY3QqIG5wT2IKICAgICByZXR1cm4gcmV0dXJuVmFsdWU7CiB9CiAKK2Jvb2wgUGx1 Z2luVmlldzo6dHJ5VG9TaG9ydENpcmN1aXRJbnZva2UoTlBPYmplY3QqLCBOUElkZW50aWZpZXIg bWV0aG9kTmFtZSwgY29uc3QgTlBWYXJpYW50KiBhcmd1bWVudHMsIHVpbnQzMl90IGFyZ3VtZW50 Q291bnQsIE5QVmFyaWFudCogcmVzdWx0KQoreworICAgIC8vIE5ldmVyIHRyeSB0byBzaG9ydC1j aXJjdWl0IGludm9rZSBpbiB0aGUgd2ViIHByb2Nlc3MuCisgICAgcmV0dXJuIGZhbHNlOworfQor CiB2b2lkIFBsdWdpblZpZXc6OnNldFN0YXR1c2JhclRleHQoY29uc3QgU3RyaW5nJiBzdGF0dXNi YXJUZXh0KQogewogICAgIGlmICghZnJhbWUoKSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaAkocmV2aXNpb24gODY1MTQpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5oCSh3b3JraW5nIGNvcHkp CkBAIC0xMzAsNiArMTMwLDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIE5QT2JqZWN0KiB3aW5k b3dTY3JpcHROUE9iamVjdCgpOwogICAgIHZpcnR1YWwgTlBPYmplY3QqIHBsdWdpbkVsZW1lbnRO UE9iamVjdCgpOwogICAgIHZpcnR1YWwgYm9vbCBldmFsdWF0ZShOUE9iamVjdCosIGNvbnN0IFN0 cmluZyZzY3JpcHRTdHJpbmcsIE5QVmFyaWFudCogcmVzdWx0LCBib29sIGFsbG93UG9wdXBzKTsK KyAgICB2aXJ0dWFsIGJvb2wgdHJ5VG9TaG9ydENpcmN1aXRJbnZva2UoTlBPYmplY3QqLCBOUElk ZW50aWZpZXIgbWV0aG9kTmFtZSwgY29uc3QgTlBWYXJpYW50KiBhcmd1bWVudHMsIHVpbnQzMl90 IGFyZ3VtZW50Q291bnQsIE5QVmFyaWFudCogcmVzdWx0KTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0 U3RhdHVzYmFyVGV4dChjb25zdCBTdHJpbmcmKTsKICAgICB2aXJ0dWFsIGJvb2wgaXNBY2NlbGVy YXRlZENvbXBvc2l0aW5nRW5hYmxlZCgpOwogICAgIHZpcnR1YWwgdm9pZCBwbHVnaW5Qcm9jZXNz Q3Jhc2hlZCgpOwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNj YXBlL05ldHNjYXBlQnJvd3NlckZ1bmNzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVCcm93c2VyRnVuY3MuY3BwCShy ZXZpc2lvbiA4NjUxNCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRz Y2FwZS9OZXRzY2FwZUJyb3dzZXJGdW5jcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY1Niw4ICs2 NTYsMTMgQEAgc3RhdGljIHZvaWQgTlBOX1JlbGVhc2VPYmplY3QoTlBPYmplY3QgKgogICAgIHJl bGVhc2VOUE9iamVjdChucE9iamVjdCk7CiB9CiAKLXN0YXRpYyBib29sIE5QTl9JbnZva2UoTlBQ LCBOUE9iamVjdCAqbnBPYmplY3QsIE5QSWRlbnRpZmllciBtZXRob2ROYW1lLCBjb25zdCBOUFZh cmlhbnQqIGFyZ3VtZW50cywgdWludDMyX3QgYXJndW1lbnRDb3VudCwgTlBWYXJpYW50KiByZXN1 bHQpCitzdGF0aWMgYm9vbCBOUE5fSW52b2tlKE5QUCBucHAsIE5QT2JqZWN0ICpucE9iamVjdCwg TlBJZGVudGlmaWVyIG1ldGhvZE5hbWUsIGNvbnN0IE5QVmFyaWFudCogYXJndW1lbnRzLCB1aW50 MzJfdCBhcmd1bWVudENvdW50LCBOUFZhcmlhbnQqIHJlc3VsdCkKIHsKKyAgICBpZiAoUmVmUHRy PE5ldHNjYXBlUGx1Z2luPiBwbHVnaW4gPSBOZXRzY2FwZVBsdWdpbjo6ZnJvbU5QUChucHApKSB7 CisgICAgICAgIGlmIChwbHVnaW4tPnRyeVRvU2hvcnRDaXJjdWl0SW52b2tlKG5wT2JqZWN0LCBt ZXRob2ROYW1lLCBhcmd1bWVudHMsIGFyZ3VtZW50Q291bnQsIHJlc3VsdCkpCisgICAgICAgICAg ICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKICAgICBpZiAobnBPYmplY3QtPl9jbGFzcy0+aW52b2tl KQogICAgICAgICByZXR1cm4gbnBPYmplY3QtPl9jbGFzcy0+aW52b2tlKG5wT2JqZWN0LCBtZXRo b2ROYW1lLCBhcmd1bWVudHMsIGFyZ3VtZW50Q291bnQsIHJlc3VsdCk7CiAKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBl L05ldHNjYXBlUGx1Z2luLmNwcAkocmV2aXNpb24gODY1MTQpCisrKyBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yMzcsNiArMjM3LDExIEBAIE5QT2JqZWN0KiBOZXRzY2FwZVBsdWdpbjo6cGx1Z2lu RWxlbWVudE4KICAgICByZXR1cm4gbV9wbHVnaW5Db250cm9sbGVyLT5wbHVnaW5FbGVtZW50TlBP YmplY3QoKTsKIH0KIAorYm9vbCBOZXRzY2FwZVBsdWdpbjo6dHJ5VG9TaG9ydENpcmN1aXRJbnZv a2UoTlBPYmplY3QqIG5wT2JqZWN0LCBOUElkZW50aWZpZXIgbWV0aG9kTmFtZSwgY29uc3QgTlBW YXJpYW50KiBhcmd1bWVudHMsIHVpbnQzMl90IGFyZ3VtZW50Q291bnQsIE5QVmFyaWFudCogcmVz dWx0KQoreworICAgIHJldHVybiBtX3BsdWdpbkNvbnRyb2xsZXItPnRyeVRvU2hvcnRDaXJjdWl0 SW52b2tlKG5wT2JqZWN0LCBtZXRob2ROYW1lLCBhcmd1bWVudHMsIGFyZ3VtZW50Q291bnQsIHJl c3VsdCk7Cit9CisKIHZvaWQgTmV0c2NhcGVQbHVnaW46OmNhbmNlbFN0cmVhbUxvYWQoTmV0c2Nh cGVQbHVnaW5TdHJlYW0qIHBsdWdpblN0cmVhbSkKIHsKICAgICBpZiAocGx1Z2luU3RyZWFtID09 IG1fbWFudWFsU3RyZWFtKSB7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaAkocmV2aXNpb24g ODY1MTQpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0 c2NhcGVQbHVnaW4uaAkod29ya2luZyBjb3B5KQpAQCAtODksNiArODksOCBAQCBwdWJsaWM6CiAg ICAgTlBPYmplY3QqIHdpbmRvd1NjcmlwdE5QT2JqZWN0KCk7CiAgICAgTlBPYmplY3QqIHBsdWdp bkVsZW1lbnROUE9iamVjdCgpOwogCisgICAgYm9vbCB0cnlUb1Nob3J0Q2lyY3VpdEludm9rZShO UE9iamVjdCosIE5QSWRlbnRpZmllciBtZXRob2ROYW1lLCBjb25zdCBOUFZhcmlhbnQqIGFyZ3Vt ZW50cywgdWludDMyX3QgYXJndW1lbnRDb3VudCwgTlBWYXJpYW50KiByZXN1bHQpOworCiAgICAg dm9pZCBjYW5jZWxTdHJlYW1Mb2FkKE5ldHNjYXBlUGx1Z2luU3RyZWFtKik7CiAgICAgdm9pZCBy ZW1vdmVQbHVnaW5TdHJlYW0oTmV0c2NhcGVQbHVnaW5TdHJlYW0qKTsKIAo=