67214 2011-08-30 11:50:08 -0700 PreloadScanner shouldn't load images inside noscript via doc.write 2011-08-30 14:26:14 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tonyg tonyg abarth eric koivisto webkit.review.bot oldest_to_newest 459054 0 tonyg 2011-08-30 11:50:08 -0700 PreloadScanner shouldn't load images inside noscript via doc.write 459062 1 105662 tonyg 2011-08-30 12:01:08 -0700 Created attachment 105662 Patch 459063 2 105662 darin 2011-08-30 12:02:49 -0700 Comment on attachment 105662 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=105662&action=review > Source/WebCore/html/parser/HTMLDocumentParser.h:154 > + // Check the document.write() output with a separate preload scanner as > + // the main scanner can't deal with insertions. I liked this comment better in its old location. 459065 3 tonyg 2011-08-30 12:03:58 -0700 Apparently this bug hit a lot of DoubleClick users: http://code.google.com/p/chromium/issues/detail?id=86911 I'm not thrilled about this approach, but it seems workable. The problem mentioned in the ChangeLog could be mitigated by clearing the m_insertionPreloadScanner after each script block is executed. But I'm not sure whether that is even worthwhile. PTAL and let me know if you have any other ideas. 459068 4 tonyg 2011-08-30 12:05:56 -0700 (In reply to comment #2) > (From update of attachment 105662 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=105662&action=review > > > Source/WebCore/html/parser/HTMLDocumentParser.h:154 > > + // Check the document.write() output with a separate preload scanner as > > + // the main scanner can't deal with insertions. > > I liked this comment better in its old location. OK, I'll move the comment back before landing. But I'll wait for feedback from Antti/Adam on the overall approach before uploading a new version of the patch. 459080 5 105662 abarth 2011-08-30 12:18:49 -0700 Comment on attachment 105662 Patch Interesting. Maybe we should clear the m_insertionPreloadScanner when we pop the current insertion point? That would keep the tokenizer in a consistent state throughout a single insertion point but get a fresh state for each new insertion point. 459084 6 105662 abarth 2011-08-30 12:25:13 -0700 Comment on attachment 105662 Patch This approach is also fine if there are some complexities in figuring out when it is safe to reset the state. 459117 7 105679 tonyg 2011-08-30 13:05:41 -0700 Created attachment 105679 Patch 459121 8 tonyg 2011-08-30 13:08:06 -0700 Okay, now I'm clearing the insertion scanner in resumeParsingAfterScriptExecution() and I updated the test to make sure we don't get stuck in the noscript state. I've also moved the comment back to the cpp file like Darin suggested. Please take another look. 459192 9 105679 webkit.review.bot 2011-08-30 14:26:10 -0700 Comment on attachment 105679 Patch Clearing flags on attachment: 105679 Committed r94111: <http://trac.webkit.org/changeset/94111> 459193 10 webkit.review.bot 2011-08-30 14:26:14 -0700 All reviewed patches have been landed. Closing bug. 105662 2011-08-30 12:01:08 -0700 2011-08-30 13:05:35 -0700 Patch bug-67214-20110830200106.patch text/plain 6016 tonyg U3VidmVyc2lvbiBSZXZpc2lvbjogOTQwOTEKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBiZmRkZjVkZmI2OGVlOWQ4ZDE1NmI1 MDFiN2ZhYjg5YmU4N2VjODg4Li45ODI4Y2I2MTg1MzNlZTk3ODZhZjRiMDkxY2Y1OWQ2MzJjNTVm M2I5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDgtMzAgIFRvbnkgR2VudGlsY29yZSAg PHRvbnlnQGNocm9taXVtLm9yZz4KKworICAgICAgICBQcmVsb2FkU2Nhbm5lciBzaG91bGRuJ3Qg bG9hZCBpbWFnZXMgaW5zaWRlIG5vc2NyaXB0IHZpYSBkb2Mud3JpdGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY3MjE0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L3ByZWxvYWRlci9kb2N1bWVu dC13cml0ZS1ub3NjcmlwdC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvcHJl bG9hZGVyL2RvY3VtZW50LXdyaXRlLW5vc2NyaXB0Lmh0bWw6IEFkZGVkLgorCiAyMDExLTA4LTMw ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBV bnJldmlld2VkLCByb2xsaW5nIG91dCByOTM5MjQuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9m YXN0L3ByZWxvYWRlci9kb2N1bWVudC13cml0ZS1ub3NjcmlwdC1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9mYXN0L3ByZWxvYWRlci9kb2N1bWVudC13cml0ZS1ub3NjcmlwdC1leHBlY3RlZC50 eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uZGRmMmNmNmFmNjUzNmQzZmU2NzUxMzJjMTdmMmRkOTgyNWMyMDFhOQot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvcHJlbG9hZGVyL2RvY3VtZW50LXdy aXRlLW5vc2NyaXB0LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxIEBACitUaGlzIHRlc3QgcmVxdWly ZXMgRHVtcFJlbmRlclRyZWUgdG8gc2VlIHRoZSBsb2cgb2Ygd2hhdCByZXNvdXJjZXMgYXJlIGxv YWRlZC4gVGhlIHRlc3QgcGFzc2VzIGlmIG5vc2NyaXB0LWltYWdlMS5wbmcgaXMgbm90IGxvYWRl ZC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvcHJlbG9hZGVyL2RvY3VtZW50LXdyaXRl LW5vc2NyaXB0Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3ByZWxvYWRlci9kb2N1bWVudC13cml0 ZS1ub3NjcmlwdC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjhhNWNjN2IyNzRjOTM5NzA3NGM0YjJiYWRhODdh NTU2MTA5NDE1YzQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3ByZWxvYWRl ci9kb2N1bWVudC13cml0ZS1ub3NjcmlwdC5odG1sCkBAIC0wLDAgKzEsMTYgQEAKKzxib2R5Pgor PHNjcmlwdD4KK2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICBsYXlvdXRU ZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVt cFJlc291cmNlUmVzcG9uc2VNSU1FVHlwZXMoKTsKK30KKzwvc2NyaXB0PgorVGhpcyB0ZXN0IHJl cXVpcmVzIER1bXBSZW5kZXJUcmVlIHRvIHNlZSB0aGUgbG9nIG9mIHdoYXQgcmVzb3VyY2VzIGFy ZSBsb2FkZWQuCitJdCB2ZXJpZmllcyB0aGF0IG5vc2NyaXB0LWltYWdlMS5wbmcgaXMgbm90IGxv YWRlZCBiZWNhdXNlIGl0IGlzIGluIGEgbm9zY3JpcHQgYmxvY2sKKworPHNjcmlwdD4KKyAgICBk b2N1bWVudC53cml0ZSgnPHNjcmlwdCBzcmM9InJlc291cmNlcy9ub24tZXhpc3RhbnQuanMiPjwv c2NyJysnaXB0PicpOworICAgIGRvY3VtZW50LndyaXRlKCc8bm9zY3JpcHQ+Jyk7CisgICAgZG9j dW1lbnQud3JpdGUoJzxpbWcgc3JjPSJyZXNvdXJjZXMvbm9zY3JpcHQtaW1hZ2UxLnBuZyI+Jyk7 CisgICAgZG9jdW1lbnQud3JpdGUoJzwvbm9zY3JpcHQ+Jyk7Cis8L3NjcmlwdD4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpp bmRleCA1ZjQxYjI1NzljZmYyNzI4ODgyNGQ1MjhmMzRjMTliYzMwYmU5ZmI4Li41YWYwNjFiMGVl NDQwMjJlYjczYjQ4ZTUzMWY1N2NkMTA4YmZmYTIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTEtMDgtMzAgIFRvbnkgR2VudGlsY29yZSAgPHRvbnlnQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBQcmVsb2FkU2Nhbm5lciBzaG91bGRuJ3QgbG9hZCBpbWFnZXMgaW5zaWRlIG5vc2Ny aXB0IHZpYSBkb2Mud3JpdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTY3MjE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGhlIHByb2JsZW0gd2FzIHRoYXQgdGhlIHRva2VuaXplciBzdGF0ZSB3YXMgbG9z dCBiZXR3ZWVuIGVhY2ggY2FsbCB0byBkb2N1bWVudC53cml0ZS4KKyAgICAgICAgVGhpcyB3b3Jr cyBhcm91bmQgdGhhdCBidWcgYnkgYXNzdW1pbmcgYWxsIGRvY3VtZW50LndyaXRlKClzIHNoYXJl IHRoZSBzYW1lIHRva2VuaXplcgorICAgICAgICBzdGF0ZS4gVGhpcyBpc24ndCByZWFsbHkgY29y cmVjdCBhcyBzdWJzZXF1ZW50IGRvY3VtZW50LndyaXRlcygpcyBtYXkgaGF2ZSBjb21wbGV0ZWx5 CisgICAgICAgIGRpZmZlcmVudCBjb250ZXh0LiBIb3dldmVyLCBhcyBmYXIgYXMgSSBjYW4gdGVs bCB0aGF0IGNvbmZ1c2lvbiB3b3VsZCBzaW1wbHkgcmVzdWx0IGluCisgICAgICAgIGxvc3Mgb2Yg YWJpbGl0eSB0byBwcmVsb2FkIHdoaWNoIGlzIG11Y2ggYmV0dGVyIHRoYW4gcHJlbG9hZGluZyB3 aGVyZSB3ZSBzaG91bGRuJ3QuCisKKyAgICAgICAgVGhlIGNvcnJlY3QgZml4IGlzIHByb2JhYmx5 IHRvIGhhdmUgYSBzaW5nbGUgcHJlbG9hZCBzY2FubmVyIHRoYXQgY2FuIGRlYWwgd2l0aCBpbnNl cnRpb25zLgorCisgICAgICAgIFRlc3Q6IGZhc3QvcHJlbG9hZGVyL2RvY3VtZW50LXdyaXRlLW5v c2NyaXB0Lmh0bWwKKworICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRG9jdW1lbnRQYXJzZXI6On5IVE1MRG9jdW1lbnRQ YXJzZXIpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTERvY3VtZW50UGFyc2VyOjpkZXRhY2gpOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTERvY3VtZW50UGFyc2VyOjppbnNlcnQpOgorICAgICAgICAq IGh0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5oOgorCiAyMDExLTA4LTMwICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBxdWVyeVNlbGVjdG9yL3F1ZXJ5 U2VsZWN0b3JBbGwgc2hvdWxkIHVzZSBzZWxlY3RvciBjaGVja2VyIGZhc3QgcGF0aCAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuY3BwCmluZGV4 IDI5YzZhM2NiMzc5ZTU0MTAyMDllOTI0MGI0MTc1ZmU5MWQ3M2E3MTEuLjkxYmEzMWZlZGM2NGZi NTE0MTVmMzY0ZWU5NGNjOTlhZjJkZTMxOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRt bC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNwcApAQCAtMTA1LDYgKzEwNSw3IEBAIEhUTUxE b2N1bWVudFBhcnNlcjo6fkhUTUxEb2N1bWVudFBhcnNlcigpCiAgICAgQVNTRVJUKCFtX3BhcnNl clNjaGVkdWxlcik7CiAgICAgQVNTRVJUKCFtX3B1bXBTZXNzaW9uTmVzdGluZ0xldmVsKTsKICAg ICBBU1NFUlQoIW1fcHJlbG9hZFNjYW5uZXIpOworICAgIEFTU0VSVCghbV9pbnNlcnRpb25QcmVs b2FkU2Nhbm5lcik7CiB9CiAKIHZvaWQgSFRNTERvY3VtZW50UGFyc2VyOjpkZXRhY2goKQpAQCAt MTE2LDYgKzExNyw3IEBAIHZvaWQgSFRNTERvY3VtZW50UGFyc2VyOjpkZXRhY2goKQogICAgIC8v IEZJWE1FOiBJdCBzZWVtcyB3cm9uZyB0aGF0IHdlIHdvdWxkIGhhdmUgYSBwcmVsb2FkIHNjYW5u ZXIgaGVyZS4KICAgICAvLyBZZXQgZHVyaW5nIGZhc3QvZG9tL0hUTUxTY3JpcHRFbGVtZW50L3Nj cmlwdC1sb2FkLWV2ZW50cy5odG1sIHdlIGRvLgogICAgIG1fcHJlbG9hZFNjYW5uZXIuY2xlYXIo KTsKKyAgICBtX2luc2VydGlvblByZWxvYWRTY2FubmVyLmNsZWFyKCk7CiAgICAgbV9wYXJzZXJT Y2hlZHVsZXIuY2xlYXIoKTsgLy8gRGVsZXRpbmcgdGhlIHNjaGVkdWxlciB3aWxsIGNsZWFyIGFu eSB0aW1lcnMuCiB9CiAKQEAgLTMyNCwxMSArMzI2LDEwIEBAIHZvaWQgSFRNTERvY3VtZW50UGFy c2VyOjppbnNlcnQoY29uc3QgU2VnbWVudGVkU3RyaW5nJiBzb3VyY2UpCiAgICAgcHVtcFRva2Vu aXplcklmUG9zc2libGUoRm9yY2VTeW5jaHJvbm91cyk7CiAgICAgCiAgICAgaWYgKGlzV2FpdGlu Z0ZvclNjcmlwdHMoKSkgewotICAgICAgICAvLyBDaGVjayB0aGUgZG9jdW1lbnQud3JpdGUoKSBv dXRwdXQgd2l0aCBhIHNlcGFyYXRlIHByZWxvYWQgc2Nhbm5lciBhcwotICAgICAgICAvLyB0aGUg bWFpbiBzY2FubmVyIGNhbid0IGRlYWwgd2l0aCBpbnNlcnRpb25zLgotICAgICAgICBIVE1MUHJl bG9hZFNjYW5uZXIgcHJlbG9hZFNjYW5uZXIoZG9jdW1lbnQoKSk7Ci0gICAgICAgIHByZWxvYWRT Y2FubmVyLmFwcGVuZFRvRW5kKHNvdXJjZSk7Ci0gICAgICAgIHByZWxvYWRTY2FubmVyLnNjYW4o KTsKKyAgICAgICAgaWYgKCFtX2luc2VydGlvblByZWxvYWRTY2FubmVyKQorICAgICAgICAgICAg bV9pbnNlcnRpb25QcmVsb2FkU2Nhbm5lciA9IGFkb3B0UHRyKG5ldyBIVE1MUHJlbG9hZFNjYW5u ZXIoZG9jdW1lbnQoKSkpOworICAgICAgICBtX2luc2VydGlvblByZWxvYWRTY2FubmVyLT5hcHBl bmRUb0VuZChzb3VyY2UpOworICAgICAgICBtX2luc2VydGlvblByZWxvYWRTY2FubmVyLT5zY2Fu KCk7CiAgICAgfQogCiAgICAgZW5kSWZEZWxheWVkKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5oCmluZGV4IDJjMDI1NWU5MzBjOWM2Yzc2Y2Ew YTc2OWMyNjJkZTNkMTZmMTZhYjkuLjc4ZGJhMmEzYzZkMDc4NDYzYWJjMTgyMGRlOTg0M2E5YTE0 NTYzZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVu dFBhcnNlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBh cnNlci5oCkBAIC0xNTAsNiArMTUwLDkgQEAgcHJpdmF0ZToKICAgICBPd25QdHI8SFRNTFNjcmlw dFJ1bm5lcj4gbV9zY3JpcHRSdW5uZXI7CiAgICAgT3duUHRyPEhUTUxUcmVlQnVpbGRlcj4gbV90 cmVlQnVpbGRlcjsKICAgICBPd25QdHI8SFRNTFByZWxvYWRTY2FubmVyPiBtX3ByZWxvYWRTY2Fu bmVyOworICAgIC8vIENoZWNrIHRoZSBkb2N1bWVudC53cml0ZSgpIG91dHB1dCB3aXRoIGEgc2Vw YXJhdGUgcHJlbG9hZCBzY2FubmVyIGFzCisgICAgLy8gdGhlIG1haW4gc2Nhbm5lciBjYW4ndCBk ZWFsIHdpdGggaW5zZXJ0aW9ucy4KKyAgICBPd25QdHI8SFRNTFByZWxvYWRTY2FubmVyPiBtX2lu c2VydGlvblByZWxvYWRTY2FubmVyOwogICAgIE93blB0cjxIVE1MUGFyc2VyU2NoZWR1bGVyPiBt X3BhcnNlclNjaGVkdWxlcjsKICAgICBIVE1MU291cmNlVHJhY2tlciBtX3NvdXJjZVRyYWNrZXI7 CiAgICAgWFNTQXVkaXRvciBtX3hzc0F1ZGl0b3I7Cg== 105679 2011-08-30 13:05:41 -0700 2011-08-30 14:26:10 -0700 Patch bug-67214-20110830210539.patch text/plain 6210 tonyg U3VidmVyc2lvbiBSZXZpc2lvbjogOTQwOTEKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBiZmRkZjVkZmI2OGVlOWQ4ZDE1NmI1 MDFiN2ZhYjg5YmU4N2VjODg4Li45ODI4Y2I2MTg1MzNlZTk3ODZhZjRiMDkxY2Y1OWQ2MzJjNTVm M2I5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDgtMzAgIFRvbnkgR2VudGlsY29yZSAg PHRvbnlnQGNocm9taXVtLm9yZz4KKworICAgICAgICBQcmVsb2FkU2Nhbm5lciBzaG91bGRuJ3Qg bG9hZCBpbWFnZXMgaW5zaWRlIG5vc2NyaXB0IHZpYSBkb2Mud3JpdGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY3MjE0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L3ByZWxvYWRlci9kb2N1bWVu dC13cml0ZS1ub3NjcmlwdC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvcHJl bG9hZGVyL2RvY3VtZW50LXdyaXRlLW5vc2NyaXB0Lmh0bWw6IEFkZGVkLgorCiAyMDExLTA4LTMw ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBV bnJldmlld2VkLCByb2xsaW5nIG91dCByOTM5MjQuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9m YXN0L3ByZWxvYWRlci9kb2N1bWVudC13cml0ZS1ub3NjcmlwdC1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9mYXN0L3ByZWxvYWRlci9kb2N1bWVudC13cml0ZS1ub3NjcmlwdC1leHBlY3RlZC50 eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uYmFjYWYyNzQwZTM2NGE1ZTg3ZDMwMDlhZmVjNzc3MDk5NzFhNWQxOQot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvcHJlbG9hZGVyL2RvY3VtZW50LXdy aXRlLW5vc2NyaXB0LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDIgQEAKK25vc2NyaXB0LWltYWdl Mi5wbmcgaGFzIE1JTUUgdHlwZSBpbWFnZS9wbmcKK1RoaXMgdGVzdCByZXF1aXJlcyBEdW1wUmVu ZGVyVHJlZSB0byBzZWUgdGhlIGxvZyBvZiB3aGF0IHJlc291cmNlcyBhcmUgbG9hZGVkLiBJdCB2 ZXJpZmllcyB0aGF0IG5vc2NyaXB0LWltYWdlMS5wbmcgaXMgbm90IGxvYWRlZCBiZWNhdXNlIGl0 IGlzIGluIGEgbm9zY3JpcHQgYmxvY2sgYW5kIG5vc2NyaXB0LWltYWdlMi5wbmcgaXMgbG9hZGVk IGJlY2F1c2UgaXQgaXMgbm90IGluIGEgbm9zY3JpcHQgYmxvY2suICAKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2Zhc3QvcHJlbG9hZGVyL2RvY3VtZW50LXdyaXRlLW5vc2NyaXB0Lmh0bWwgYi9M YXlvdXRUZXN0cy9mYXN0L3ByZWxvYWRlci9kb2N1bWVudC13cml0ZS1ub3NjcmlwdC5odG1sCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAuLmMwMDAyMjhmMTk1ZjBiZmMxYjFiNzA3ZmE2ZDBiMmQ0YzVkZWQ0NGMKLS0tIC9k ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3ByZWxvYWRlci9kb2N1bWVudC13cml0ZS1u b3NjcmlwdC5odG1sCkBAIC0wLDAgKzEsMjYgQEAKKzxib2R5PgorPHNjcmlwdD4KK2lmICh3aW5k b3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1w QXNUZXh0KCk7CisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcFJlc291cmNlUmVzcG9uc2VN SU1FVHlwZXMoKTsKK30KKzwvc2NyaXB0PgorVGhpcyB0ZXN0IHJlcXVpcmVzIER1bXBSZW5kZXJU cmVlIHRvIHNlZSB0aGUgbG9nIG9mIHdoYXQgcmVzb3VyY2VzIGFyZSBsb2FkZWQuCitJdCB2ZXJp ZmllcyB0aGF0IG5vc2NyaXB0LWltYWdlMS5wbmcgaXMgbm90IGxvYWRlZCBiZWNhdXNlIGl0IGlz IGluIGEgbm9zY3JpcHQgYmxvY2sgYW5kCitub3NjcmlwdC1pbWFnZTIucG5nIGlzIGxvYWRlZCBi ZWNhdXNlIGl0IGlzIG5vdCBpbiBhIG5vc2NyaXB0IGJsb2NrLgorCis8c2NyaXB0PgorICAgIGRv Y3VtZW50LndyaXRlKCc8c2NyaXB0IHNyYz0icmVzb3VyY2VzL25vbi1leGlzdGFudC5qcyI+PC9z Y3InKydpcHQ+Jyk7CisgICAgZG9jdW1lbnQud3JpdGUoJzxub3NjcmlwdD4nKTsKKyAgICBkb2N1 bWVudC53cml0ZSgnPGltZyBzcmM9InJlc291cmNlcy9ub3NjcmlwdC1pbWFnZTEucG5nIj4nKTsK KyAgICBkb2N1bWVudC53cml0ZSgnPC9ub3NjcmlwdD4nKTsKKzwvc2NyaXB0PgorCis8c2NyaXB0 PgorICAgIGRvY3VtZW50LndyaXRlKCc8bm9zY3JpcHQ+Jyk7Cis8L3NjcmlwdD4KKzwvbm9zY3Jp cHQ+Cis8c2NyaXB0PgorICAgIGRvY3VtZW50LndyaXRlKCc8c2NyaXB0IHNyYz0icmVzb3VyY2Vz L25vbi1leGlzdGFudC5qcyI+PC9zY3InKydpcHQ+Jyk7CisgICAgZG9jdW1lbnQud3JpdGUoJzxp bWcgc3JjPSJyZXNvdXJjZXMvbm9zY3JpcHQtaW1hZ2UyLnBuZyI+Jyk7Cis8L3NjcmlwdD4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwppbmRleCA1ZjQxYjI1NzljZmYyNzI4ODgyNGQ1MjhmMzRjMTliYzMwYmU5ZmI4Li5mMzVk OTdjNTQyNjRiYTNkYWU5ZTU3YzdiMWY2N2RmOWM4MmJjOTEwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjIgQEAKKzIwMTEtMDgtMzAgIFRvbnkgR2VudGlsY29yZSAgPHRvbnlnQGNocm9taXVtLm9y Zz4KKworICAgICAgICBQcmVsb2FkU2Nhbm5lciBzaG91bGRuJ3QgbG9hZCBpbWFnZXMgaW5zaWRl IG5vc2NyaXB0IHZpYSBkb2Mud3JpdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTY3MjE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhlIHByb2JsZW0gd2FzIHRoYXQgdGhlIHRva2VuaXplciBzdGF0ZSB3 YXMgbG9zdCBiZXR3ZWVuIGVhY2ggY2FsbCB0byBkb2N1bWVudC53cml0ZS4KKyAgICAgICAgVGhp cyB3b3JrcyBhcm91bmQgdGhhdCBidWcgYnkgbWFraW5nIGFsbCBkb2N1bWVudC53cml0ZSgpcyBp biB0aGUgc2FtZSBzY3JpcHQgYmxvY2sgc2hhcmUKKyAgICAgICAgdGhlIHNhbWUgdG9rZW5pemVy IHN0YXRlLgorCisgICAgICAgIFRlc3Q6IGZhc3QvcHJlbG9hZGVyL2RvY3VtZW50LXdyaXRlLW5v c2NyaXB0Lmh0bWwKKworICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRG9jdW1lbnRQYXJzZXI6On5IVE1MRG9jdW1lbnRQ YXJzZXIpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTERvY3VtZW50UGFyc2VyOjpkZXRhY2gpOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTERvY3VtZW50UGFyc2VyOjppbnNlcnQpOgorICAgICAgICAq IGh0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5oOgorCiAyMDExLTA4LTMwICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBxdWVyeVNlbGVjdG9yL3F1ZXJ5 U2VsZWN0b3JBbGwgc2hvdWxkIHVzZSBzZWxlY3RvciBjaGVja2VyIGZhc3QgcGF0aCAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuY3BwCmluZGV4 IDI5YzZhM2NiMzc5ZTU0MTAyMDllOTI0MGI0MTc1ZmU5MWQ3M2E3MTEuLjMxMjA5N2ZkNTJmYzFi NDE0OWE0MzI5NmMxM2E3YzVmMDY1OWNiODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRt bC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNwcApAQCAtMTA1LDYgKzEwNSw3IEBAIEhUTUxE b2N1bWVudFBhcnNlcjo6fkhUTUxEb2N1bWVudFBhcnNlcigpCiAgICAgQVNTRVJUKCFtX3BhcnNl clNjaGVkdWxlcik7CiAgICAgQVNTRVJUKCFtX3B1bXBTZXNzaW9uTmVzdGluZ0xldmVsKTsKICAg ICBBU1NFUlQoIW1fcHJlbG9hZFNjYW5uZXIpOworICAgIEFTU0VSVCghbV9pbnNlcnRpb25QcmVs b2FkU2Nhbm5lcik7CiB9CiAKIHZvaWQgSFRNTERvY3VtZW50UGFyc2VyOjpkZXRhY2goKQpAQCAt MTE2LDYgKzExNyw3IEBAIHZvaWQgSFRNTERvY3VtZW50UGFyc2VyOjpkZXRhY2goKQogICAgIC8v IEZJWE1FOiBJdCBzZWVtcyB3cm9uZyB0aGF0IHdlIHdvdWxkIGhhdmUgYSBwcmVsb2FkIHNjYW5u ZXIgaGVyZS4KICAgICAvLyBZZXQgZHVyaW5nIGZhc3QvZG9tL0hUTUxTY3JpcHRFbGVtZW50L3Nj cmlwdC1sb2FkLWV2ZW50cy5odG1sIHdlIGRvLgogICAgIG1fcHJlbG9hZFNjYW5uZXIuY2xlYXIo KTsKKyAgICBtX2luc2VydGlvblByZWxvYWRTY2FubmVyLmNsZWFyKCk7CiAgICAgbV9wYXJzZXJT Y2hlZHVsZXIuY2xlYXIoKTsgLy8gRGVsZXRpbmcgdGhlIHNjaGVkdWxlciB3aWxsIGNsZWFyIGFu eSB0aW1lcnMuCiB9CiAKQEAgLTMyNiw5ICszMjgsMTAgQEAgdm9pZCBIVE1MRG9jdW1lbnRQYXJz ZXI6Omluc2VydChjb25zdCBTZWdtZW50ZWRTdHJpbmcmIHNvdXJjZSkKICAgICBpZiAoaXNXYWl0 aW5nRm9yU2NyaXB0cygpKSB7CiAgICAgICAgIC8vIENoZWNrIHRoZSBkb2N1bWVudC53cml0ZSgp IG91dHB1dCB3aXRoIGEgc2VwYXJhdGUgcHJlbG9hZCBzY2FubmVyIGFzCiAgICAgICAgIC8vIHRo ZSBtYWluIHNjYW5uZXIgY2FuJ3QgZGVhbCB3aXRoIGluc2VydGlvbnMuCi0gICAgICAgIEhUTUxQ cmVsb2FkU2Nhbm5lciBwcmVsb2FkU2Nhbm5lcihkb2N1bWVudCgpKTsKLSAgICAgICAgcHJlbG9h ZFNjYW5uZXIuYXBwZW5kVG9FbmQoc291cmNlKTsKLSAgICAgICAgcHJlbG9hZFNjYW5uZXIuc2Nh bigpOworICAgICAgICBpZiAoIW1faW5zZXJ0aW9uUHJlbG9hZFNjYW5uZXIpCisgICAgICAgICAg ICBtX2luc2VydGlvblByZWxvYWRTY2FubmVyID0gYWRvcHRQdHIobmV3IEhUTUxQcmVsb2FkU2Nh bm5lcihkb2N1bWVudCgpKSk7CisgICAgICAgIG1faW5zZXJ0aW9uUHJlbG9hZFNjYW5uZXItPmFw cGVuZFRvRW5kKHNvdXJjZSk7CisgICAgICAgIG1faW5zZXJ0aW9uUHJlbG9hZFNjYW5uZXItPnNj YW4oKTsKICAgICB9CiAKICAgICBlbmRJZkRlbGF5ZWQoKTsKQEAgLTQ3NSw2ICs0NzgsNyBAQCB2 b2lkIEhUTUxEb2N1bWVudFBhcnNlcjo6cmVzdW1lUGFyc2luZ0FmdGVyU2NyaXB0RXhlY3V0aW9u KCkKICAgICBBU1NFUlQoIWluU2NyaXB0RXhlY3V0aW9uKCkpOwogICAgIEFTU0VSVCghbV90cmVl QnVpbGRlci0+aXNQYXVzZWQoKSk7CiAKKyAgICBtX2luc2VydGlvblByZWxvYWRTY2FubmVyLmNs ZWFyKCk7CiAgICAgcHVtcFRva2VuaXplcklmUG9zc2libGUoQWxsb3dZaWVsZCk7CiAgICAgZW5k SWZEZWxheWVkKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9I VE1MRG9jdW1lbnRQYXJzZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1 bWVudFBhcnNlci5oCmluZGV4IDJjMDI1NWU5MzBjOWM2Yzc2Y2EwYTc2OWMyNjJkZTNkMTZmMTZh YjkuLjY3NmEwYzFmMTYzYWMwZTZiM2U2YTI2MWI0NDk1OTQxMzJlNTcwNmEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5oCkBAIC0xNTAsNiAr MTUwLDcgQEAgcHJpdmF0ZToKICAgICBPd25QdHI8SFRNTFNjcmlwdFJ1bm5lcj4gbV9zY3JpcHRS dW5uZXI7CiAgICAgT3duUHRyPEhUTUxUcmVlQnVpbGRlcj4gbV90cmVlQnVpbGRlcjsKICAgICBP d25QdHI8SFRNTFByZWxvYWRTY2FubmVyPiBtX3ByZWxvYWRTY2FubmVyOworICAgIE93blB0cjxI VE1MUHJlbG9hZFNjYW5uZXI+IG1faW5zZXJ0aW9uUHJlbG9hZFNjYW5uZXI7CiAgICAgT3duUHRy PEhUTUxQYXJzZXJTY2hlZHVsZXI+IG1fcGFyc2VyU2NoZWR1bGVyOwogICAgIEhUTUxTb3VyY2VU cmFja2VyIG1fc291cmNlVHJhY2tlcjsKICAgICBYU1NBdWRpdG9yIG1feHNzQXVkaXRvcjsK