15804 2007-11-02 14:46:19 -0700 <object> fallback does not work when both URL and MIME type are omitted 2007-11-02 23:38:38 -0700 1 1 1 Unclassified WebKit Page Loading 523.x (Safari 3) Mac OS X 10.4 RESOLVED FIXED InRadar P2 Normal --- 1 darin darin mcguire mitz shadow2531 oldest_to_newest 60086 0 darin 2007-11-02 14:46:19 -0700 Simple test cases demonstrate that <object> won't show its fallback content if both the URL and the MIME type are omitted. 60087 1 16999 darin 2007-11-02 14:46:48 -0700 Created attachment 16999 patch 60089 2 darin 2007-11-02 14:47:31 -0700 <rdar://problem/5530185> 60096 3 16999 mitz 2007-11-02 15:10:59 -0700 Comment on attachment 16999 patch + (-[WebNullPluginView reportFailure]): Added. Does the actual delegate + callback. Happens back at the top level of the run loop so it doesn't + fire deep inside layout. Also wrote this so that it is guaranteed not to + reenter and so that it can handle the case where the delegate destroys + the world (including this object). This is good to fix for WebKit's own Null plugin, (you're fixing bug 15405), but other WebKit plugins can still presumably run arbitrary code under attach(), either mutating the DOM or putting up a sheet, which will cause reentry into WebCore. 60099 4 16999 mitz 2007-11-02 15:33:12 -0700 Comment on attachment 16999 patch r=me. I just need to make sure to follow up on bug 15404 if it gets closed as a result (which it should). 60100 5 mitz 2007-11-02 15:34:06 -0700 (In reply to comment #4) > bug 15404 I mean bug 15405. 60106 6 darin 2007-11-02 16:21:13 -0700 Committed revision 27378. 60142 7 ddkilzer 2007-11-02 23:37:34 -0700 *** Bug 7536 has been marked as a duplicate of this bug. *** 60144 8 ddkilzer 2007-11-02 23:38:38 -0700 *** Bug 15202 has been marked as a duplicate of this bug. *** 16999 2007-11-02 14:46:48 -0700 2007-11-02 15:33:12 -0700 patch EmptyObjectPatch.txt text/plain 11985 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNzM3NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDctMTEtMDIgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gZml4 IDxyZGFyOi8vcHJvYmxlbS81NTMwMTg1PiBXZWJLaXQgZG9lcyBub3Qgc2hvdyA8b2JqZWN0PiBm YWxsYmFjayBjb250ZW50IHdoZW4gYm90aAorICAgICAgICAgIFVSTCBhbmQgTUlNRSB0eXBlIGlz IG9taXR0ZWQKKworICAgICAgICBBbHJlYWR5IGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMgKHRo YXQgaGFkIGluY29ycmVjdCByZXN1bHRzKS4KKworICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRl ci5jcHA6IChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6cmVxdWVzdE9iamVjdCk6IFJldHVybiBmYWxz ZSB0byBpbmRpY2F0ZQorICAgICAgICBmYWlsdXJlIHdoZW4gYm90aCBVUkwgYW5kIE1JTUUgdHlw ZSBhcmUgZW1wdHkuIFRoZSBvbGQgY29kZSB3b3VsZCBub3QgYXR0ZW1wdCBhIGxvYWQsIGJ1dAor ICAgICAgICBpdCB3b3VsZCBpbmRpY2F0ZSBzdWNjZXNzLgorCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlclBhcnRPYmplY3QuY3BwOiAoV2ViQ29yZTo6UmVuZGVyUGFydE9iamVjdDo6dXBkYXRl V2lkZ2V0KTogUmVtb3ZlCisgICAgICAgIG5vbi1oZWxwZnVsIGVhcmx5IGV4aXQgZm9yIHRoZSBj YXNlIHdoZXJlIHRoZXJlIGlzIG5vIFVSTCBhbmQgbm8gdHlwZS4gUmV0dXJuaW5nIGVhcmx5Cisg ICAgICAgIHByZXZlbnRzIHRoZSBmYWxsYmFjayBjb2RlIGZyb20gcnVubmluZy4KKwogMjAwNy0x MS0wMSAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEFsZXhleS4KSW5kZXg6IFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAJKHJldmlzaW9uIDI3Mzc1KQor KysgV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTUz LDcgKzE1NTMsNyBAQCBib29sIEZyYW1lTG9hZGVyOjpyZXF1ZXN0T2JqZWN0KFJlbmRlclBhCiAg ICAgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtTmFt ZXMsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbVZhbHVlcykKIHsKICAgICBpZiAodXJsLmlz RW1wdHkoKSAmJiBtaW1lVHlwZS5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiB0cnVlOworICAg ICAgICByZXR1cm4gZmFsc2U7CiAKICNpZiBVU0UoTE9XX0JBTkRXSURUSF9ESVNQTEFZKQogICAg IC8vIGRvbid0IGNhcmUgb2JqZWN0IGR1cmluZyBsb3cgYmFuZHdpZHRoIGRpc3BsYXkKSW5kZXg6 IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclBhcnRPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclBhcnRPYmplY3QuY3BwCShyZXZpc2lvbiAyNzM3NSkKKysr IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclBhcnRPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yMDQsOSArMjA0LDYgQEAgdm9pZCBSZW5kZXJQYXJ0T2JqZWN0Ojp1cGRhdGVXaWRnZXQoYm9v bAogICAgICAgaWYgKHNlcnZpY2VUeXBlLmlzRW1wdHkoKSAmJiAhby0+bV9jbGFzc0lkLmlzRW1w dHkoKSkKICAgICAgICAgICBtYXBDbGFzc0lkVG9TZXJ2aWNlVHlwZShvLT5tX2NsYXNzSWQsIHNl cnZpY2VUeXBlKTsKICAgICAgIAotICAgICAgLy8gSWYgbm8gVVJMIGFuZCB0eXBlLCBhYm9ydC4K LSAgICAgIGlmICh1cmwuaXNFbXB0eSgpICYmIHNlcnZpY2VUeXBlLmlzRW1wdHkoKSkKLSAgICAg ICAgICByZXR1cm47CiAgICAgICBpZiAoIWlzVVJMQWxsb3dlZChkb2N1bWVudCgpLCB1cmwpKQog ICAgICAgICAgIHJldHVybjsKIApJbmRleDogV2ViS2l0L0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzM3NikKKysrIFdlYktpdC9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwzMCBAQAorMjAwNy0xMS0wMiAgRGFyaW4gQWRsZXIg IDxkYXJpbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgLSBmaXggcHJvYmxlbSBJIHJhbiBpbnRvIHdoaWxlIGRvaW5nIHNvbWUgdGVz dGluZyBvbiBNYWMgZm9yCisgICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU1MzAxODU+IFdlYktp dCBkb2VzIG5vdCBzaG93IDxvYmplY3Q+CisgICAgICAgICAgZmFsbGJhY2sgY29udGVudCB3aGVu IGJvdGggVVJMIGFuZCBNSU1FIHR5cGUgaXMgb21pdHRlZAorCisgICAgICAgIEkgZG9uJ3Qga25v dyBob3cgdG8gcmVwcm9kdWNlIHRoaXMgZmFpbHVyZSBpbiBEdW1wUmVuZGVyVHJlZSwgc28gdGhl cmUgaXMgbm8KKyAgICAgICAgcmVncmVzc2lvbiB0ZXN0LgorCisgICAgICAgICogUGx1Z2lucy9X ZWJOdWxsUGx1Z2luVmlldy5oOiBSZW1vdmVkIHNvbWUgdW5uZWVkZWQgZGVjbGFyYXRpb25zLCBp bmNsdWRpbmcKKyAgICAgICAgdGhlIGRpZFNlbmRFcnJvciBsb2NhbCB2YXJpYWJsZS4gSW5zdGVh ZCB3ZSBqdXN0IHNldCB0aGUgZXJyb3IgdG8gbmlsIG9uY2UKKyAgICAgICAgd2UndmUgc2VudCBp dC4KKyAgICAgICAgKiBQbHVnaW5zL1dlYk51bGxQbHVnaW5WaWV3Lm1tOgorICAgICAgICAoLVtX ZWJOdWxsUGx1Z2luVmlldyBpbml0V2l0aEZyYW1lOmVycm9yOkRPTUVsZW1lbnQ6XSk6IFJlZmFj dG9yZWQgc28gdGhhdAorICAgICAgICB0aGUgbnVsbCBwbHVnLWluIGltYWdlIGNvZGUgaXMgc2Vw YXJhdGUgZnJvbSB0aGUgcmVzdCBvZiB0aGUgZnVuY3Rpb24gYW5kCisgICAgICAgIHNvIHRoYXQg dGhlIHdob2xlIHRoaW5nIGlzIG5vdCBpbnNpZGUgYW4gaWYgc3RhdGVtZW50LiBBbHNvIGRvbid0 IGhvbGQgYQorICAgICAgICByZWZlcmVuY2UgdG8gdGhlIERPTSBlbGVtZW50IGlmIHRoZXJlIGlz IG5vIGVycm9yIHRvIHJlcG9ydC4KKyAgICAgICAgKC1bV2ViTnVsbFBsdWdpblZpZXcgcmVwb3J0 RmFpbHVyZV0pOiBBZGRlZC4gRG9lcyB0aGUgYWN0dWFsIGRlbGVnYXRlCisgICAgICAgIGNhbGxi YWNrLiBIYXBwZW5zIGJhY2sgYXQgdGhlIHRvcCBsZXZlbCBvZiB0aGUgcnVuIGxvb3Agc28gaXQg ZG9lc24ndAorICAgICAgICBmaXJlIGRlZXAgaW5zaWRlIGxheW91dC4gQWxzbyB3cm90ZSB0aGlz IHNvIHRoYXQgaXQgaXMgZ3VhcmFudGVlZCBub3QgdG8KKyAgICAgICAgcmVlbnRlciBhbmQgc28g dGhhdCBpdCBjYW4gaGFuZGxlIHRoZSBjYXNlIHdoZXJlIHRoZSBkZWxlZ2F0ZSBkZXN0cm95cwor ICAgICAgICB0aGUgd29ybGQgKGluY2x1ZGluZyB0aGlzIG9iamVjdCkuCisgICAgICAgICgtW1dl Yk51bGxQbHVnaW5WaWV3IHZpZXdEaWRNb3ZlVG9XaW5kb3ddKTogUmVtb3ZlZCBtb3N0IG9mIHRo ZSBjb2RlOworICAgICAgICBjaGFuZ2VkIHNvIGl0IGp1c3QgZG9lcyBhIHBlcmZvcm1TZWxlY3Rv cjphZnRlckRlbGF5OjAuCisKIDIwMDctMTEtMDIgIE1hcmsgUm93ZSAgPG1yb3dlQGFwcGxlLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IFdlYktpdC9QbHVn aW5zL1dlYk51bGxQbHVnaW5WaWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L1BsdWdpbnMvV2Vi TnVsbFBsdWdpblZpZXcuaAkocmV2aXNpb24gMjczNzUpCisrKyBXZWJLaXQvUGx1Z2lucy9XZWJO dWxsUGx1Z2luVmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENv cHlyaWdodCAoQykgMjAwNSBBcHBsZSBDb21wdXRlciwgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZl ZC4KKyAqIENvcHlyaWdodCAoQykgMjAwNSwgMjAwNyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFy eSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQg cHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTI4LDE3ICsyOCwxNCBA QAogCiAjaW1wb3J0IDxBcHBLaXQvQXBwS2l0Lmg+CiAKLUBjbGFzcyBOU0Vycm9yOwotQGNsYXNz IFdlYkZyYW1lOwogQGNsYXNzIERPTUVsZW1lbnQ7CiAKIEBpbnRlcmZhY2UgV2ViTnVsbFBsdWdp blZpZXcgOiBOU0ltYWdlVmlldwogewotICAgIEJPT0wgZGlkU2VuZEVycm9yOwogICAgIE5TRXJy b3IgKmVycm9yOwogICAgIERPTUVsZW1lbnQgKmVsZW1lbnQ7CiB9CiAKLS0gKGlkKWluaXRXaXRo RnJhbWU6KE5TUmVjdClmcmFtZSBlcnJvcjooTlNFcnJvciAqKXBsdWdpbkVycm9yIERPTUVsZW1l bnQ6KERPTUVsZW1lbnQgKillbGVtZW50OworLSAoaWQpaW5pdFdpdGhGcmFtZTooTlNSZWN0KWZy YW1lIGVycm9yOihOU0Vycm9yICopZXJyb3IgRE9NRWxlbWVudDooRE9NRWxlbWVudCAqKWVsZW1l bnQ7CiAKIEBlbmQKSW5kZXg6IFdlYktpdC9QbHVnaW5zL1dlYk51bGxQbHVnaW5WaWV3Lm1tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdC9QbHVnaW5zL1dlYk51bGxQbHVnaW5WaWV3Lm1tCShyZXZpc2lv biAyNzM3NSkKKysrIFdlYktpdC9QbHVnaW5zL1dlYk51bGxQbHVnaW5WaWV3Lm1tCSh3b3JraW5n IGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAwNSBBcHBsZSBD b21wdXRlciwgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAw NSwgMjAwNyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmli dXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0 CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93 aW5nIGNvbmRpdGlvbnMKQEAgLTI2LDM4ICsyNiwzMyBAQAogICogVEhJUyBTT0ZUV0FSRSwgRVZF TiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCi0j aW1wb3J0IDxXZWJDb3JlL0RvY3VtZW50Lmg+Ci0jaW1wb3J0IDxXZWJDb3JlL0VsZW1lbnQuaD4K LSNpbXBvcnQgPFdlYktpdC9XZWJEYXRhU291cmNlLmg+Ci0jaW1wb3J0IDxXZWJLaXQvV2ViRnJh bWUuaD4KLSNpbXBvcnQgPFdlYktpdC9XZWJGcmFtZUludGVybmFsLmg+Ci0jaW1wb3J0IDxXZWJL aXQvV2ViRnJhbWVWaWV3Lmg+Ci0jaW1wb3J0IDxXZWJLaXQvV2ViTlNVUkxFeHRyYXMuaD4KLSNp bXBvcnQgPFdlYktpdC9XZWJOU1ZpZXdFeHRyYXMuaD4KLSNpbXBvcnQgPFdlYktpdC9XZWJOdWxs UGx1Z2luVmlldy5oPgotI2ltcG9ydCA8V2ViS2l0L1dlYlJlc291cmNlTG9hZERlbGVnYXRlLmg+ Ci0jaW1wb3J0IDxXZWJLaXQvV2ViVmlld0ludGVybmFsLmg+CisjaW1wb3J0ICJXZWJOdWxsUGx1 Z2luVmlldy5oIgogCi1zdGF0aWMgTlNJbWFnZSAqaW1hZ2UgPSBuaWw7CisjaW1wb3J0ICJXZWJG cmFtZUludGVybmFsLmgiCisjaW1wb3J0ICJXZWJWaWV3SW50ZXJuYWwuaCIKKyNpbXBvcnQgPFdl YkNvcmUvRG9jdW1lbnQuaD4KIAogQGltcGxlbWVudGF0aW9uIFdlYk51bGxQbHVnaW5WaWV3CiAK LS0gaW5pdFdpdGhGcmFtZTooTlNSZWN0KWZyYW1lIGVycm9yOihOU0Vycm9yICopcGx1Z2luRXJy b3IgRE9NRWxlbWVudDooRE9NRWxlbWVudCAqKWFuRWxlbWVudAorLSBpbml0V2l0aEZyYW1lOihO U1JlY3QpZnJhbWUgZXJyb3I6KE5TRXJyb3IgKillcnIgRE9NRWxlbWVudDooRE9NRWxlbWVudCAq KWVsZW0KIHsgICAgCisgICAgc3RhdGljIE5TSW1hZ2UgKm51bGxQbHVnSW5JbWFnZTsKKyAgICBp ZiAoIW51bGxQbHVnSW5JbWFnZSkgeworICAgICAgICBOU0J1bmRsZSAqYnVuZGxlID0gW05TQnVu ZGxlIGJ1bmRsZUZvckNsYXNzOltXZWJOdWxsUGx1Z2luVmlldyBjbGFzc11dOworICAgICAgICBO U1N0cmluZyAqaW1hZ2VQYXRoID0gW2J1bmRsZSBwYXRoRm9yUmVzb3VyY2U6QCJudWxscGx1Z2lu IiBvZlR5cGU6QCJ0aWZmIl07CisgICAgICAgIG51bGxQbHVnSW5JbWFnZSA9IFtbTlNJbWFnZSBh bGxvY10gaW5pdFdpdGhDb250ZW50c09mRmlsZTppbWFnZVBhdGhdOworICAgIH0KKyAgICAKICAg ICBzZWxmID0gW3N1cGVyIGluaXRXaXRoRnJhbWU6ZnJhbWVdOwotICAgIGlmIChzZWxmKSB7Cisg ICAgaWYgKCFzZWxmKQorICAgICAgICByZXR1cm4gbmlsOwogCi0gICAgICAgIGlmICghaW1hZ2Up IHsKLSAgICAgICAgICAgIE5TQnVuZGxlICpidW5kbGUgPSBbTlNCdW5kbGUgYnVuZGxlRm9yQ2xh c3M6W1dlYk51bGxQbHVnaW5WaWV3IGNsYXNzXV07Ci0gICAgICAgICAgICBOU1N0cmluZyAqaW1h Z2VQYXRoID0gW2J1bmRsZSBwYXRoRm9yUmVzb3VyY2U6QCJudWxscGx1Z2luIiBvZlR5cGU6QCJ0 aWZmIl07Ci0gICAgICAgICAgICBpbWFnZSA9IFtbTlNJbWFnZSBhbGxvY10gaW5pdFdpdGhDb250 ZW50c09mRmlsZTppbWFnZVBhdGhdOwotICAgICAgICB9Ci0gICAgICAgIAotICAgICAgICBbc2Vs ZiBzZXRJbWFnZTppbWFnZV07CisgICAgZXJyb3IgPSBbZXJyIHJldGFpbl07CisgICAgaWYgKGVy cikKKyAgICAgICAgZWxlbWVudCA9IFtlbGVtIHJldGFpbl07CisKKyAgICBbc2VsZiBzZXRJbWFn ZTpudWxsUGx1Z0luSW1hZ2VdOwogCi0gICAgICAgIGVycm9yID0gW3BsdWdpbkVycm9yIHJldGFp bl07Ci0gICAgICAgIGVsZW1lbnQgPSBbYW5FbGVtZW50IHJldGFpbl07Ci0gICAgfQogICAgIHJl dHVybiBzZWxmOwogfQogCkBAIC02OSwxOCArNjQsMzUgQEAgc3RhdGljIE5TSW1hZ2UgKmltYWdl ID0gbmlsOwogICAgIFtzdXBlciBkZWFsbG9jXTsKIH0KIAotLSAodm9pZCl2aWV3RGlkTW92ZVRv V2luZG93CistICh2b2lkKXJlcG9ydEZhaWx1cmUKIHsKLSAgICBpZiAoIWRpZFNlbmRFcnJvciAm JiBfd2luZG93ICYmIGVycm9yKSB7Ci0gICAgICAgIGRpZFNlbmRFcnJvciA9IFlFUzsKLSAgICAg ICAgV2ViRnJhbWUgKndlYkZyYW1lID0ga2l0KGNvcmUoZWxlbWVudCktPmRvY3VtZW50KCktPmZy YW1lKCkpOwotICAgICAgICBXZWJWaWV3ICp3ZWJWaWV3ID0gW3dlYkZyYW1lIHdlYlZpZXddOwot ICAgICAgICBXZWJEYXRhU291cmNlICpkYXRhU291cmNlID0gW3dlYkZyYW1lIF9kYXRhU291cmNl XTsKKyAgICBOU0Vycm9yICpsb2NhbEVycm9yID0gZXJyb3I7CisgICAgRE9NRWxlbWVudCAqbG9j YWxFbGVtZW50ID0gZWxlbWVudDsKKworICAgIGVycm9yID0gbmlsOworICAgIGVsZW1lbnQgPSBu aWw7CiAKKyAgICBXZWJGcmFtZSAqd2ViRnJhbWUgPSBraXQoY29yZShsb2NhbEVsZW1lbnQpLT5k b2N1bWVudCgpLT5mcmFtZSgpKTsKKyAgICBpZiAod2ViRnJhbWUpIHsKKyAgICAgICAgV2ViVmll dyAqd2ViVmlldyA9IFt3ZWJGcmFtZSB3ZWJWaWV3XTsKICAgICAgICAgV2ViUmVzb3VyY2VEZWxl Z2F0ZUltcGxlbWVudGF0aW9uQ2FjaGUgaW1wbGVtZW50YXRpb25zID0gV2ViVmlld0dldFJlc291 cmNlTG9hZERlbGVnYXRlSW1wbGVtZW50YXRpb25zKHdlYlZpZXcpOwogICAgICAgICBpZiAoaW1w bGVtZW50YXRpb25zLnBsdWdJbkZhaWxlZFdpdGhFcnJvckZ1bmMpCi0gICAgICAgICAgICBDYWxs UmVzb3VyY2VMb2FkRGVsZWdhdGUoaW1wbGVtZW50YXRpb25zLnBsdWdJbkZhaWxlZFdpdGhFcnJv ckZ1bmMsIHdlYlZpZXcsIEBzZWxlY3Rvcih3ZWJWaWV3OnBsdWdJbkZhaWxlZFdpdGhFcnJvcjpk YXRhU291cmNlOiksIGVycm9yLCBkYXRhU291cmNlKTsKKyAgICAgICAgICAgIENhbGxSZXNvdXJj ZUxvYWREZWxlZ2F0ZShpbXBsZW1lbnRhdGlvbnMucGx1Z0luRmFpbGVkV2l0aEVycm9yRnVuYywg d2ViVmlldywKKyAgICAgICAgICAgICAgICBAc2VsZWN0b3Iod2ViVmlldzpwbHVnSW5GYWlsZWRX aXRoRXJyb3I6ZGF0YVNvdXJjZTopLCBsb2NhbEVycm9yLCBbd2ViRnJhbWUgX2RhdGFTb3VyY2Vd KTsKICAgICB9CisKKyAgICBbbG9jYWxFcnJvciByZWxlYXNlXTsKKyAgICBbbG9jYWxFbGVtZW50 IHJlbGVhc2VdOworfQorCistICh2b2lkKXZpZXdEaWRNb3ZlVG9XaW5kb3cKK3sKKyAgICBpZiAo IWVycm9yKQorICAgICAgICByZXR1cm47CisKKyAgICBbTlNPYmplY3QgY2FuY2VsUHJldmlvdXNQ ZXJmb3JtUmVxdWVzdHNXaXRoVGFyZ2V0OnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKHJlcG9ydEZh aWx1cmUpIG9iamVjdDpuaWxdOworICAgIGlmIChbc2VsZiB3aW5kb3ddKQorICAgICAgICBbc2Vs ZiBwZXJmb3JtU2VsZWN0b3I6QHNlbGVjdG9yKHJlcG9ydEZhaWx1cmUpIHdpdGhPYmplY3Q6bmls IGFmdGVyRGVsYXk6MC4wXTsKIH0KIAogQGVuZApJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMjczNzYpCisr KyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAor MjAwNy0xMS0wMiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgLSB1cGRhdGUgdGVzdHMgYWZmZWN0 ZWQgYnkgZml4IGZvciA8cmRhcjovL3Byb2JsZW0vNTUzMDE4NT4gV2ViS2l0IGRvZXMgbm90IHNo b3cKKyAgICAgICAgICA8b2JqZWN0PiBmYWxsYmFjayBjb250ZW50IHdoZW4gYm90aCBVUkwgYW5k IE1JTUUgdHlwZSBpcyBvbWl0dGVkCisKKyAgICAgICAgKiBkb20vaHRtbC9sZXZlbDIvaHRtbC9B cHBsZXRzQ29sbGVjdGlvbi1leHBlY3RlZC50eHQ6IFRoZSB0ZXh0ICJOb3RoaW5nIGhlcmUhIiBy ZW5kZXJzIG5vdy4KKyAgICAgICAgKiBmYXN0L2RvbS9IVE1MRG9jdW1lbnQvb2JqZWN0LWJ5LW5h bWUtdW5rbm93bi1jaGlsZC1lbGVtZW50LWV4cGVjdGVkLnR4dDogU29tZSBibGFuaworICAgICAg ICBzcGFjZSByZW5kZXJzIG5vdy4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvZmFzdC9pbnZhbGlk L3Jlc2lkdWFsLXN0eWxlLWV4cGVjdGVkLnR4dDogQSBmb250IGVsZW1lbnQgcmVuZGVycyBub3cu CisKIDIwMDctMTEtMDEgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAg ICAtIGZpeCB0eXBvIGluIHRlc3QgbmFtZQpJbmRleDogTGF5b3V0VGVzdHMvZG9tL2h0bWwvbGV2 ZWwyL2h0bWwvQXBwbGV0c0NvbGxlY3Rpb24tZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL2RvbS9odG1sL2xldmVsMi9odG1sL0FwcGxldHNDb2xsZWN0aW9uLWV4cGVjdGVk LnR4dAkocmV2aXNpb24gMjczNzUpCisrKyBMYXlvdXRUZXN0cy9kb20vaHRtbC9sZXZlbDIvaHRt bC9BcHBsZXRzQ29sbGVjdGlvbi1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTksNyAr OSw3IEBAIEFwcGxldHMgbGVuZ3RoIGlzIGN1cnJlbnRseSAwCiAKIEFwcGxldHMgbGVuZ3RoIGlz IGN1cnJlbnRseSAwCiAKLQorTm90aGluZyBoZXJlIQogQXBwbGV0cyBsZW5ndGggaXMgY3VycmVu dGx5IDAKIAogCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2RvbS9IVE1MRG9jdW1lbnQvb2JqZWN0 LWJ5LW5hbWUtdW5rbm93bi1jaGlsZC1lbGVtZW50LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9mYXN0L2RvbS9IVE1MRG9jdW1lbnQvb2JqZWN0LWJ5LW5hbWUtdW5rbm93 bi1jaGlsZC1lbGVtZW50LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMjczNzUpCisrKyBMYXlvdXRU ZXN0cy9mYXN0L2RvbS9IVE1MRG9jdW1lbnQvb2JqZWN0LWJ5LW5hbWUtdW5rbm93bi1jaGlsZC1l bGVtZW50LWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIgQEAKLQogVGhp cyB0ZXN0cyB0aGF0IGFuIG9iamVjdCBlbGVtZW50IHdpdGggYW4gdW5rbm93biBjaGlsZCBlbGVt ZW50IGlzIHN0aWxsIHBhcnQgb2YgdGhlIGRvY3VtZW50J3MgbmFtZWQgaXRlbSBtYXAuCiBTVUND RVNTCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9pbnZhbGlkL3Jlc2lkdWFs LXN0eWxlLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMvZmFzdC9pbnZhbGlkL3Jlc2lkdWFsLXN0eWxlLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMjcz NzUpCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9pbnZhbGlkL3Jlc2lkdWFsLXN0 eWxlLWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtNTIzLDcgKzUyMyw4IEBAIGxheWVy IGF0ICgwLDApIHNpemUgNzg1eDM1NDMKICAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgw LDApIHNpemUgNjh4MTgKICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCA2ODogIk9C SkVDVDogIgogICAgICAgICBSZW5kZXJJbmxpbmUge0ZPTlR9IGF0ICgwLDApIHNpemUgMTcxeDE4 IFtjb2xvcj0jMDA4MDAwXQotICAgICAgICAgIFJlbmRlclBhcnRPYmplY3Qge09CSkVDVH0gYXQg KDY4LDE0KSBzaXplIDB4MAorICAgICAgICAgIFJlbmRlcklubGluZSB7T0JKRUNUfSBhdCAoMCww KSBzaXplIDB4MTgKKyAgICAgICAgICAgIFJlbmRlcklubGluZSB7Rk9OVH0gYXQgKDAsMCkgc2l6 ZSAweDE4IFtjb2xvcj0jRkYwMDAwXQogICAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAo NjgsMCkgc2l6ZSAxNzF4MTgKICAgICAgICAgICAgIHRleHQgcnVuIGF0ICg2OCwwKSB3aWR0aCAx NzE6ICJBbGwgb2YgdGhpcyBzaG91bGQgYmUgZ3JlZW4uIgogICAgICAgICBSZW5kZXJUZXh0IHsj dGV4dH0gYXQgKDAsMCkgc2l6ZSAweDAKQEAgLTU3Nyw3ICs1NzgsOCBAQCBsYXllciBhdCAoMCww KSBzaXplIDc4NXgzNTQzCiAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXpl IDY2eDE4CiAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggNjY6ICJQQVJBTTogIgog ICAgICAgICBSZW5kZXJJbmxpbmUge0ZPTlR9IGF0ICgwLDApIHNpemUgMTcxeDE4IFtjb2xvcj0j MDA4MDAwXQotICAgICAgICAgIFJlbmRlclBhcnRPYmplY3Qge09CSkVDVH0gYXQgKDY2LDE0KSBz aXplIDB4MAorICAgICAgICAgIFJlbmRlcklubGluZSB7T0JKRUNUfSBhdCAoMCwwKSBzaXplIDB4 MTgKKyAgICAgICAgICAgIFJlbmRlcklubGluZSB7Rk9OVH0gYXQgKDAsMCkgc2l6ZSAweDE4IFtj b2xvcj0jRkYwMDAwXQogICAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoNjYsMCkgc2l6 ZSAxNzF4MTgKICAgICAgICAgICAgIHRleHQgcnVuIGF0ICg2NiwwKSB3aWR0aCAxNzE6ICJBbGwg b2YgdGhpcyBzaG91bGQgYmUgZ3JlZW4uIgogICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQg KDAsMCkgc2l6ZSAweDAK