23538 2009-01-25 15:00:15 -0800 REGRESSION (r39969): Garbage text instead of blank content rendered when plug-ins are disabled 2009-01-26 12:31:06 -0800 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED InRadar P1 Major --- 1 darin darin oldest_to_newest 106976 0 darin 2009-01-25 15:00:15 -0800 Code to handle the case where we have an ActiveX plug-in that was added back in http://trac.webkit.org/changeset/39115 combined with code to handle the case of disabled plug-ins in http://trac.webkit.org/changeset/39969 to create a bad effect. Due to the combined effect of these changes we'd ignore the class ID and MIME type entirely, and render plug-in content as HTML. * STEPS TO REPRODUCE 1) Disable plug-ins 2) Go to http://www.ilounge.com/ or http://www.talkingpointsmemo.com/ 3) Reload page if necessary * RESULTS Banner ads or sometimes embedded Flash content on those websites contain garbage text rather than being rendered blank. 106977 1 darin 2009-01-25 15:03:51 -0800 <rdar://problem/6523719> 106979 2 27030 darin 2009-01-25 15:27:52 -0800 Created attachment 27030 patch 106980 3 darin 2009-01-25 15:43:25 -0800 http://trac.webkit.org/changeset/40234 107067 4 mrowe 2009-01-26 12:31:06 -0800 *** Bug 23537 has been marked as a duplicate of this bug. *** 27030 2009-01-25 15:27:52 -0800 2009-01-25 15:40:38 -0800 patch PluginPatch.txt text/plain 8599 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MDIzMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzUgQEAKKzIwMDktMDEtMjUgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyAy MzUzODogUkVHUkVTU0lPTiAocjM5OTY5KTogR2FyYmFnZSB0ZXh0IGluc3RlYWQgb2YgYmxhbmsg Y29udGVudCByZW5kZXJlZCB3aGVuIHBsdWctaW5zIGFyZSBkaXNhYmxlZAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1MzgKKyAgICAgICAgcmRhcjov L3Byb2JsZW0vNjUyMzcxOQorCisgICAgICAgIEknbSBub3Qgc3VyZSBob3cgdG8gbWFrZSBhIHJl Z3Jlc3Npb24gdGVzdCBmb3IgdGhpcywgc2luY2UgaXQgZGVwZW5kcyBvbiBwbHVnLWlucyBiZWlu ZyBkaXNhYmxlZC4KKworICAgICAgICBUaGUgbWFpbiBwcm9ibGVtIGhlcmUgaXMgdGhhdCB3aGVu IHBsdWctaW5zIHdlcmUgZGlzYWJsZWQsIHRoZSBjb2RlIGlnbm9yZWQgdGhlIGNsYXNzSWQgYXR0 cmlidXRlIGFuZAorICAgICAgICB0aGUgPGVtYmVkPiBlbGVtZW50IGVudGlyZWx5LiBUaGF0IHJl c3VsdGVkIGluIGEgcGFnZSB0cmVhdGluZyBhIEZsYXNoIGRvY3VtZW50IGFzIHBsYWluIEhUTUwg cmF0aGVyCisgICAgICAgIHRoYW4gZG9pbmcgZmFsbGJhY2suCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyUGFydE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVDbGFzc0lk VG9UeXBlTWFwKTogQWRkZWQuIEJyb2tlIHRoaXMgb3V0IGludG8gYSBzZXBhcmF0ZSBmdW5jdGlv biBzbyB3ZSBjb3VsZCBnZXQgcmlkIG9mIGFuCisgICAgICAgIGluZWxlZ2FudCBpZiBzdGF0ZW1l bnQuCisgICAgICAgIChXZWJDb3JlOjphY3RpdmVYVHlwZSk6IEFkZGVkLiBUbyBhdm9pZCByZXBl YXRpbmcgdGhlIE1JTUUgdHlwZSBmb3IgQWN0aXZlWCBhbmQgcG9zc2libHkgaGF2aW5nIGEgdHlw by4KKyAgICAgICAgKFdlYkNvcmU6OmhhdmVQbHVnaW4pOiBBZGRlZC4gSGVscGVyIGZ1bmN0aW9u IHRvIG1ha2Ugc3VyZSB3ZSBkb24ndCBmb3JnZXQgdGhlIG51bGwgY2hlY2suCisgICAgICAgIChX ZWJDb3JlOjpzZXJ2aWNlVHlwZUZvckNsYXNzSWQpOiBHaXZlIHRoaXMgZnVuY3Rpb24gYSByZXR1 cm4gdmFsdWUgc2luY2UgdGhhdCdzIGEgbW9yZSBuYXR1cmFsIHdheSB0bworICAgICAgICByZXR1 cm4gYSBzdHJpbmcgdGhhbiBhbiAib3V0IiBwYXJhbWV0ZXIuICBGaXhlZCB0aGUgbG9naWMgdG8g b25seSBwcmVmZXIgdGhlIEFjdGl2ZVggdHlwZSBvdmVyIHRoZQorICAgICAgICB0eXBlIGd1ZXNz ZWQgZnJvbSB0aGUgY2xhc3NJZCB3aGVuIHRoZXJlIGFjdHVhbGx5IGlzIGFuIEFjdGl2ZVggcGx1 Zy1pbiB0byB1c2UuIFRoZSBvbGQgZnVuY3Rpb24gYXNzdW1lZAorICAgICAgICB0aGVyZSB3YXMg b25lLCB3aGljaCBJIHByZXN1bWUgcmlnaHQgZm9yIENocm9tZSBvbiBXaW5kb3dzIHdoZW4gcGx1 Zy1pbnMgYXJlIGVuYWJsZWQsIGJ1dCB3cm9uZyBpbiBtYW55CisgICAgICAgIG90aGVyIGNhc2Vz LCBhbmQgd3JvbmcgYWxsIHRoZSB0aW1lIGZvciBhbGwgY2xpZW50cyBvbiBNYWMuIFdlIGRvbid0 IHdhbnQgdG8gYXNzdW1lIGVpdGhlciB3YXkuIFVzZSB0aGUKKyAgICAgICAgbmV3IGhhdmVQbHVn aW4gZnVuY3Rpb24gc28gd2UgaGFuZGxlIHRoZSBjYXNlIHdoZXJlIHBsdWdpbkRhdGEgaXMgMC4K KyAgICAgICAgKFdlYkNvcmU6OnNob3VsZFVzZUVtYmVkRGVzY2VuZGFudCk6IFJlbmFtZWQuIFNp bXBsaWZpZWQgdGhlIGNvbW1lbnQuIENoYW5nZWQgdG8gdXNlIHNlcnZpY2VUeXBlRm9yQ2xhc3NJ ZAorICAgICAgICBpbnN0ZWFkIG9mIHRoZSBvbGQgdmVyc2lvbiB0aGF0IHVzZWQgYW4gb3V0IHBh cmFtZXRlci4gQWx3YXlzIHVzZSB0aGUgPGVtYmVkPiBpZiB0aGVyZSBpc24ndCBhIHBsdWctaW4K KyAgICAgICAgdGhhdCBrbm93cyBob3cgdG8gaGFuZGxlIDxvYmplY3Q+IGVsZW1lbnRzLgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyUGFydE9iamVjdDo6dXBkYXRlV2lkZ2V0KTogUmVtb3ZlZCBu dWxsIGNoZWNrcyBvZiBwbHVnaW5EYXRhLiBUaGUgdHdvIGZ1bmN0aW9ucyB0aGF0CisgICAgICAg IHVzZSB0aGlzIGRhdGEgc3RpbGwgbmVlZCB0byBiZSBjYWxsZWQ7IHRoZXkgc3RpbGwgZG8gc29t ZXRoaW5nIGV2ZW4gaWYgbm8gcGx1Zy1pbnMgYXJlIHByZXNlbnQuIEFuZAorICAgICAgICB0aGV5 IGhhdmUgbm93IGJlZW4gY29ycmVjdGVkIHRvIGhhbmRsZSAwIHByb3Blcmx5LgorCiAyMDA5LTAx LTI1ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJNZW51TGlzdC5jcHA6IEZpeCBidWlsZCBieSBhZGRpbmcgYmFjayBuZWVkZWQgaW5j bHVkZS4KSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclBhcnRPYmplY3QuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclBhcnRPYmplY3QuY3BwCShyZXZpc2lv biA0MDIyOCkKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclBhcnRPYmplY3QuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC04MCw0NiArODAsNjEgQEAgc3RhdGljIGJvb2wgaXNVUkxBbGxvd2VkKERv Y3VtZW50KiBkb2MsIAogICAgIHJldHVybiB0cnVlOwogfQogCi1zdGF0aWMgaW5saW5lIHZvaWQg bWFwQ2xhc3NJZFRvU2VydmljZVR5cGUoY29uc3QgU3RyaW5nJiBjbGFzc0lkLCBTdHJpbmcmIHNl cnZpY2VUeXBlLCBjb25zdCBQbHVnaW5EYXRhKiBwbHVnaW5EYXRhKQordHlwZWRlZiBIYXNoTWFw PFN0cmluZywgU3RyaW5nLCBDYXNlRm9sZGluZ0hhc2g+IENsYXNzSWRUb1R5cGVNYXA7CisKK3N0 YXRpYyBDbGFzc0lkVG9UeXBlTWFwKiBjcmVhdGVDbGFzc0lkVG9UeXBlTWFwKCkKK3sKKyAgICBD bGFzc0lkVG9UeXBlTWFwKiBtYXAgPSBuZXcgQ2xhc3NJZFRvVHlwZU1hcDsKKyAgICBtYXAtPmFk ZCgiY2xzaWQ6RDI3Q0RCNkUtQUU2RC0xMUNGLTk2QjgtNDQ0NTUzNTQwMDAwIiwgImFwcGxpY2F0 aW9uL3gtc2hvY2t3YXZlLWZsYXNoIik7CisgICAgbWFwLT5hZGQoImNsc2lkOkNGQ0RBQTAzLThC RTQtMTFDRi1CODRCLTAwMjBBRkJCQ0NGQSIsICJhdWRpby94LXBuLXJlYWxhdWRpby1wbHVnaW4i KTsKKyAgICBtYXAtPmFkZCgiY2xzaWQ6MDJCRjI1RDUtOEMxNy00QjIzLUJDODAtRDM0ODhBQkRE QzZCIiwgInZpZGVvL3F1aWNrdGltZSIpOworICAgIG1hcC0+YWRkKCJjbHNpZDoxNjZCMUJDQS0z RjlDLTExQ0YtODA3NS00NDQ1NTM1NDAwMDAiLCAiYXBwbGljYXRpb24veC1kaXJlY3RvciIpOwor I2lmIEVOQUJMRShBQ1RJVkVYX1RZUEVfQ09OVkVSU0lPTl9XTVBMQVlFUikKKyAgICBtYXAtPmFk ZCgiY2xzaWQ6NkJGNTJBNTItMzk0QS0xMUQzLUIxNTMtMDBDMDRGNzlGQUE2IiwgImFwcGxpY2F0 aW9uL3gtbXBsYXllcjIiKTsKKyAgICBtYXAtPmFkZCgiY2xzaWQ6MjJENkYzMTItQjBGNi0xMUQw LTk0QUItMDA4MEM3NEM3RTk1IiwgImFwcGxpY2F0aW9uL3gtbXBsYXllcjIiKTsKKyNlbmRpZgor ICAgIHJldHVybiBtYXA7Cit9CisKK3N0YXRpYyBjb25zdCBTdHJpbmcmIGFjdGl2ZVhUeXBlKCkK K3sKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywgYWN0aXZlWFR5cGUsICgiYXBwbGlj YXRpb24veC1vbGVvYmplY3QiKSk7CisgICAgcmV0dXJuIGFjdGl2ZVhUeXBlOworfQorCitzdGF0 aWMgaW5saW5lIGJvb2wgaGF2ZVBsdWdpbihjb25zdCBQbHVnaW5EYXRhKiBwbHVnaW5EYXRhLCBj b25zdCBTdHJpbmcmIHR5cGUpCit7CisgICAgcmV0dXJuIHBsdWdpbkRhdGEgJiYgcGx1Z2luRGF0 YS0+c3VwcG9ydHNNaW1lVHlwZSh0eXBlKTsKK30KKworc3RhdGljIFN0cmluZyBzZXJ2aWNlVHlw ZUZvckNsYXNzSWQoY29uc3QgU3RyaW5nJiBjbGFzc0lkLCBjb25zdCBQbHVnaW5EYXRhKiBwbHVn aW5EYXRhKQogewogICAgIC8vIFJldHVybiBlYXJseSBpZiBjbGFzc0lkIGlzIGVtcHR5IChzaW5j ZSB3ZSB3b24ndCBkbyBhbnl0aGluZyBiZWxvdykuCiAgICAgLy8gRnVydGhlcm1vcmUsIGlmIGNs YXNzSWQgaXMgbnVsbCwgY2FsbGluZyBnZXQoKSBiZWxvdyB3aWxsIGNyYXNoLgogICAgIGlmIChj bGFzc0lkLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gU3RyaW5n KCk7CiAKLSAgICB0eXBlZGVmIEhhc2hNYXA8U3RyaW5nLCBTdHJpbmcsIENhc2VGb2xkaW5nSGFz aD4gU2VydmljZVR5cGVIYXNoTWFwOwotICAgIHN0YXRpYyBTZXJ2aWNlVHlwZUhhc2hNYXAqIHNl cnZpY2VUeXBlRmFsbGJhY2tGb3JDbGFzc0lkID0gMDsKLSAgICBpZiAoIXNlcnZpY2VUeXBlRmFs bGJhY2tGb3JDbGFzc0lkKSB7Ci0gICAgICAgIHNlcnZpY2VUeXBlRmFsbGJhY2tGb3JDbGFzc0lk ID0gbmV3IFNlcnZpY2VUeXBlSGFzaE1hcDsKLSAgICAgICAgc2VydmljZVR5cGVGYWxsYmFja0Zv ckNsYXNzSWQtPmFkZCgiY2xzaWQ6RDI3Q0RCNkUtQUU2RC0xMUNGLTk2QjgtNDQ0NTUzNTQwMDAw IiwgImFwcGxpY2F0aW9uL3gtc2hvY2t3YXZlLWZsYXNoIik7Ci0gICAgICAgIHNlcnZpY2VUeXBl RmFsbGJhY2tGb3JDbGFzc0lkLT5hZGQoImNsc2lkOkNGQ0RBQTAzLThCRTQtMTFDRi1CODRCLTAw MjBBRkJCQ0NGQSIsICJhdWRpby94LXBuLXJlYWxhdWRpby1wbHVnaW4iKTsKLSAgICAgICAgc2Vy dmljZVR5cGVGYWxsYmFja0ZvckNsYXNzSWQtPmFkZCgiY2xzaWQ6MDJCRjI1RDUtOEMxNy00QjIz LUJDODAtRDM0ODhBQkREQzZCIiwgInZpZGVvL3F1aWNrdGltZSIpOwotICAgICAgICBzZXJ2aWNl VHlwZUZhbGxiYWNrRm9yQ2xhc3NJZC0+YWRkKCJjbHNpZDoxNjZCMUJDQS0zRjlDLTExQ0YtODA3 NS00NDQ1NTM1NDAwMDAiLCAiYXBwbGljYXRpb24veC1kaXJlY3RvciIpOwotI2lmIEVOQUJMRShB Q1RJVkVYX1RZUEVfQ09OVkVSU0lPTl9XTVBMQVlFUikKLSAgICAgICAgc2VydmljZVR5cGVGYWxs YmFja0ZvckNsYXNzSWQtPmFkZCgiY2xzaWQ6NkJGNTJBNTItMzk0QS0xMUQzLUIxNTMtMDBDMDRG NzlGQUE2IiwgImFwcGxpY2F0aW9uL3gtbXBsYXllcjIiKTsKLSAgICAgICAgc2VydmljZVR5cGVG YWxsYmFja0ZvckNsYXNzSWQtPmFkZCgiY2xzaWQ6MjJENkYzMTItQjBGNi0xMUQwLTk0QUItMDA4 MEM3NEM3RTk1IiwgImFwcGxpY2F0aW9uL3gtbXBsYXllcjIiKTsKLSNlbmRpZgotICAgIH0KKyAg ICBzdGF0aWMgQ2xhc3NJZFRvVHlwZU1hcCogbWFwID0gY3JlYXRlQ2xhc3NJZFRvVHlwZU1hcCgp OworICAgIFN0cmluZyB0eXBlID0gbWFwLT5nZXQoY2xhc3NJZCk7CiAKLSAgICBjb25zdCBTdHJp bmcgZmFsbGJhY2tTZXJ2aWNlVHlwZSA9IHNlcnZpY2VUeXBlRmFsbGJhY2tGb3JDbGFzc0lkLT5n ZXQoY2xhc3NJZCk7Ci0gICAgaWYgKHBsdWdpbkRhdGEtPnN1cHBvcnRzTWltZVR5cGUoZmFsbGJh Y2tTZXJ2aWNlVHlwZSkpCi0gICAgICAgIHNlcnZpY2VUeXBlID0gZmFsbGJhY2tTZXJ2aWNlVHlw ZTsKLSAgICBlbHNlIGlmIChwbHVnaW5EYXRhLT5zdXBwb3J0c01pbWVUeXBlKCJhcHBsaWNhdGlv bi94LW9sZW9iamVjdCIpKQotICAgICAgICBzZXJ2aWNlVHlwZSA9ICJhcHBsaWNhdGlvbi94LW9s ZW9iamVjdCI7Ci19Ci0KLXN0YXRpYyBib29sIHNob3VsZFVzZUNoaWxkRW1iZWRPZk9iamVjdChI VE1MT2JqZWN0RWxlbWVudCogbywgY29uc3QgUGx1Z2luRGF0YSogcGx1Z2luRGF0YSkKLXsKLSAg ICAvLyBBbiBPQkpFQ1QgdGFnIHdpdGggYSBjbGFzc0lkIGlzIHNvbWUga2luZCBvZiBBY3RpdmVY IGNvbnRyb2wuICBUaGUgbW9zdAotICAgIC8vIGNvbW1vbiBjb250cm9scyBoYXZlIHBhcmFsbGVs IHBsdWdpbiB2ZXJzaW9ucyBhbmQgdGh1cyBwb3NzaWJseSBuZXN0ZWQKLSAgICAvLyBFTUJFRCB0 YWdzLiAgSWYgdGhpcyBpcyB0aGUgY2FzZSwgdGhlIE9CSkVDVCdzIGNsYXNzSWQgc2hvdWxkIG1h cCB0byBzb21lCi0gICAgLy8ga25vd24gcGx1Z2luIE1JTUUgdHlwZS4gIElmIGl0IGRvZXNuJ3Qs IGVpdGhlciB0aGUgY29udHJvbCBpcyB1bmxpa2VseSB0bwotICAgIC8vIGhhdmUgYSBwYXJhbGxl bCBwbHVnaW4gaW1wbGVtZW50YXRpb24gKHNvIHRoZXJlJ3Mgbm8gcG9pbnQgbG9va2luZwotICAg IC8vIGluc2lkZSksIG9yIHdlJ3ZlIHB1cnBvc2VmdWxseSBkaXNhYmxlZCBjb252ZXJzaW9uIGZv ciB0aGlzIGNsYXNzSWQsIGluCi0gICAgLy8gd2hpY2ggY2FzZSB3ZSB3YW50IHRvIHVzZSB0aGUg QWN0aXZlWCBPQkpFQ1QgaW5zdGVhZCBvZiB0aGUgRU1CRUQgYW55d2F5LgotICAgIFN0cmluZyBz ZXJ2aWNlVHlwZTsKLSAgICBtYXBDbGFzc0lkVG9TZXJ2aWNlVHlwZShvLT5jbGFzc0lkKCksIHNl cnZpY2VUeXBlLCBwbHVnaW5EYXRhKTsKLSAgICByZXR1cm4gc2VydmljZVR5cGUgIT0gImFwcGxp Y2F0aW9uL3gtb2xlb2JqZWN0IjsKKyAgICBpZiAodHlwZS5pc0VtcHR5KCkpCisgICAgICAgIHJl dHVybiBhY3RpdmVYVHlwZSgpOworCisgICAgLy8gSWYgd2UgZG8gaGF2ZSBhIHBsdWctaW4gdGhh dCBzdXBwb3J0cyBnZW5lcmljIEFjdGl2ZVggY29udGVudCBhbmQgZG9uJ3QgaGF2ZSBhIHBsdWct aW4KKyAgICAvLyBmb3IgdGhlIE1JTUUgdHlwZSB3ZSBjYW1lIHVwIHdpdGgsIGlnbm9yZSB0aGUg TUlNRSB0eXBlIHdlIGNhbWUgdXAgd2l0aCBhbmQganVzdCB1c2UKKyAgICAvLyB0aGUgQWN0aXZl WCB0eXBlLgorICAgIGlmIChoYXZlUGx1Z2luKHBsdWdpbkRhdGEsIGFjdGl2ZVhUeXBlKCkpICYm ICFoYXZlUGx1Z2luKHBsdWdpbkRhdGEsIHR5cGUpKQorICAgICAgICByZXR1cm4gYWN0aXZlWFR5 cGUoKTsKKworICAgIHJldHVybiB0eXBlOworfQorCitzdGF0aWMgaW5saW5lIGJvb2wgc2hvdWxk VXNlRW1iZWREZXNjZW5kYW50KEhUTUxPYmplY3RFbGVtZW50KiBvYmplY3RFbGVtZW50LCBjb25z dCBQbHVnaW5EYXRhKiBwbHVnaW5EYXRhKQoreworICAgIC8vIElmIHdlIGhhdmUgYm90aCBhbiA8 b2JqZWN0PiBhbmQgPGVtYmVkPiwgd2UgYWx3YXlzIHdhbnQgdG8gdXNlIHRoZSA8ZW1iZWQ+IGV4 Y2VwdCB3aGVuIHdlIGhhdmUKKyAgICAvLyBhbiBBY3RpdmVYIHBsdWctaW4gYW5kIHBsYW4gdG8g dXNlIGl0LgorICAgIHJldHVybiAhKGhhdmVQbHVnaW4ocGx1Z2luRGF0YSwgYWN0aXZlWFR5cGUo KSkKKyAgICAgICAgJiYgc2VydmljZVR5cGVGb3JDbGFzc0lkKG9iamVjdEVsZW1lbnQtPmNsYXNz SWQoKSwgcGx1Z2luRGF0YSkgPT0gYWN0aXZlWFR5cGUoKSk7CiB9CiAKIHZvaWQgUmVuZGVyUGFy dE9iamVjdDo6dXBkYXRlV2lkZ2V0KGJvb2wgb25seUNyZWF0ZU5vbk5ldHNjYXBlUGx1Z2lucykK QEAgLTE0MCw4ICsxNTUsOCBAQCB2b2lkIFJlbmRlclBhcnRPYmplY3Q6OnVwZGF0ZVdpZGdldChi b29sCiAgICAgICAgIC8vIENoZWNrIGZvciBhIGNoaWxkIEVNQkVEIHRhZy4KICAgICAgICAgSFRN TEVtYmVkRWxlbWVudCogZW1iZWQgPSAwOwogICAgICAgICBjb25zdCBQbHVnaW5EYXRhKiBwbHVn aW5EYXRhID0gZnJhbWUtPnBhZ2UoKS0+cGx1Z2luRGF0YSgpOwotICAgICAgICBpZiAocGx1Z2lu RGF0YSAmJiBzaG91bGRVc2VDaGlsZEVtYmVkT2ZPYmplY3QobywgcGx1Z2luRGF0YSkpIHsKLSAg ICAgICAgICAgIGZvciAoTm9kZSogY2hpbGQgPSBvLT5maXJzdENoaWxkKCk7IGNoaWxkOykgewor ICAgICAgICBpZiAoc2hvdWxkVXNlRW1iZWREZXNjZW5kYW50KG8sIHBsdWdpbkRhdGEpKSB7Cisg ICAgICAgICAgICBmb3IgKE5vZGUqIGNoaWxkID0gby0+Zmlyc3RDaGlsZCgpOyBjaGlsZDsgKSB7 CiAgICAgICAgICAgICAgICAgaWYgKGNoaWxkLT5oYXNUYWdOYW1lKGVtYmVkVGFnKSkgewogICAg ICAgICAgICAgICAgICAgICBlbWJlZCA9IHN0YXRpY19jYXN0PEhUTUxFbWJlZEVsZW1lbnQqPihj aGlsZCk7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwpAQCAtMjE5LDggKzIzNCw4IEBAIHZv aWQgUmVuZGVyUGFydE9iamVjdDo6dXBkYXRlV2lkZ2V0KGJvb2wKICAgICAgICAgfQogCiAgICAg ICAgIC8vIElmIHdlIHN0aWxsIGRvbid0IGhhdmUgYSB0eXBlLCB0cnkgdG8gbWFwIGZyb20gYSBz cGVjaWZpYyBDTEFTU0lEIHRvIGEgdHlwZS4KLSAgICAgICAgaWYgKHBsdWdpbkRhdGEgJiYgc2Vy dmljZVR5cGUuaXNFbXB0eSgpKQotICAgICAgICAgICAgbWFwQ2xhc3NJZFRvU2VydmljZVR5cGUo by0+Y2xhc3NJZCgpLCBzZXJ2aWNlVHlwZSwgcGx1Z2luRGF0YSk7CisgICAgICAgIGlmIChzZXJ2 aWNlVHlwZS5pc0VtcHR5KCkpCisgICAgICAgICAgICBzZXJ2aWNlVHlwZSA9IHNlcnZpY2VUeXBl Rm9yQ2xhc3NJZChvLT5jbGFzc0lkKCksIHBsdWdpbkRhdGEpOwogCiAgICAgICAgIGlmICghaXNV UkxBbGxvd2VkKGRvY3VtZW50KCksIHVybCkpCiAgICAgICAgICAgICByZXR1cm47Cg==