108377 2013-01-30 14:05:52 -0800 [HTMLTemplateElement] prevent the parser from removing nodes from the content when the foster agency is processing formatting elements 2013-01-30 15:13:28 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 103547 1 rafaelw rafaelw abarth adamk eric ojan.autocc webkit.review.bot oldest_to_newest 820518 0 rafaelw 2013-01-30 14:05:52 -0800 https://www.w3.org/Bugs/Public/show_bug.cgi?id=20829 820530 1 185562 rafaelw 2013-01-30 14:11:05 -0800 Created attachment 185562 Patch 820569 2 185562 adamk 2013-01-30 14:29:12 -0800 Comment on attachment 185562 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=185562&action=review > Source/WebCore/html/parser/HTMLTreeBuilder.cpp:1592 > + if (commonAncestor->hasTagName(templateTag)) Wouldn't it be nice if we could just do this check inside parserAppendChild? We probably don't want to do this for performance reasons, but we could at least add an ASSERT that the parser never appends directly to <template>. Sort of weird to have an assertion about HTML parsing behavior in ContainerNode.cpp, but then parserAppendChild is effectively part of the HTML parser anyway. 820574 3 185562 rafaelw 2013-01-30 14:30:35 -0800 Comment on attachment 185562 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=185562&action=review >> Source/WebCore/html/parser/HTMLTreeBuilder.cpp:1592 >> + if (commonAncestor->hasTagName(templateTag)) > > Wouldn't it be nice if we could just do this check inside parserAppendChild? We probably don't want to do this for performance reasons, but we could at least add an ASSERT that the parser never appends directly to <template>. Sort of weird to have an assertion about HTML parsing behavior in ContainerNode.cpp, but then parserAppendChild is effectively part of the HTML parser anyway. done 820577 4 185576 rafaelw 2013-01-30 14:31:35 -0800 Created attachment 185576 Patch 820586 5 185576 abarth 2013-01-30 14:34:21 -0800 Comment on attachment 185576 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=185576&action=review > LayoutTests/html5lib/resources/template.dat:946 > +<body><template><i><menu>Foo</i> Not really related to this patch, but do you have commit rights to the html5lib codesite project? 820590 6 rafaelw 2013-01-30 14:36:38 -0800 no. that'd be nice =-). 820665 7 185576 webkit.review.bot 2013-01-30 15:13:25 -0800 Comment on attachment 185576 Patch Clearing flags on attachment: 185576 Committed r141327: <http://trac.webkit.org/changeset/141327> 820666 8 webkit.review.bot 2013-01-30 15:13:28 -0800 All reviewed patches have been landed. Closing bug. 185562 2013-01-30 14:11:05 -0800 2013-01-30 14:31:33 -0800 Patch bug-108377-20130130140750.patch text/plain 5612 rafaelw U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTg2NTc2ZWJjM2Q2ODhm NGVlMDUwOTNmYmE4M2FlYjZhODczNTc4ZS4uMDAyNjkwMjI4ZmZhNzIyMDdlZDBjODIzMmU4YTQz NGJhMjZjYzE1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAxLTMwICBSYWZh ZWwgV2VpbnN0ZWluICA8cmFmYWVsd0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0hUTUxUZW1w bGF0ZUVsZW1lbnRdIHByZXZlbnQgdGhlIHBhcnNlciBmcm9tIHJlbW92aW5nIG5vZGVzIGZyb20g dGhlIGNvbnRlbnQgd2hlbiB0aGUgZm9zdGVyIGFnZW5jeSBpcyBwcm9jZXNzaW5nIGZvcm1hdHRp bmcgZWxlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEwODM3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIGh0dHBzOi8vZHZjcy53My5vcmcvaGcvd2ViY29tcG9uZW50cy9yYXctZmlsZS81MGNlMWYz NjhjMWEvc3BlYy90ZW1wbGF0ZXMvaW5kZXguaHRtbCNpbi1ib2R5LWFkZGl0aW9uCisKKyAgICAg ICAgY2FsbFRoZUFkb3B0aW9uQWdlbmN5IG5vdyBhcHBlbmRzIHRvIHRoZSB0ZW1wbGF0ZSdzIGNv bnRlbnQgd2hlbiBpdCBwcmV2aW91c2x5IHdvdWxkIGhhdmUgYXBwZW5kZWQgdG8gdGhlIHRlbXBs YXRlIGVsZW1lbnQgaXRzZWxmLgorCisgICAgICAgIE5ldyB0ZXN0IGFkZGVkIHRvIGh0bWw1bGli LgorCisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTFRyZWVCdWlsZGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6Y2FsbFRoZUFkb3B0aW9uQWdlbmN5KToKKwogMjAx My0wMS0zMCAgVG9ueSBDaGFuZyAgPHRvbnlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJFR1JF U1NJT04ocjEzNjMyNCk6IEZsZXhib3ggc2hvdWxkIHJlbGF5b3V0IGZsZXggY2hpbGRyZW4gd2hl biB3aWR0aCBjaGFuZ2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9I VE1MVHJlZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRyZWVC dWlsZGVyLmNwcAppbmRleCBjNzAxMTlkNzI0ZTNjZThiMGZhMDEzMjdhMTI1ODEwYzA3NzBlN2M3 Li43ODMxM2VlMzE2ZTI5MGE4MzQ4MjM2ZDlmY2RmOTVmM2FkN2ZjYWZkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxUcmVlQnVpbGRlci5jcHAKQEAgLTM0LDYgKzM0LDcg QEAKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJIVE1MUGFyc2VySWRpb21zLmgi CiAjaW5jbHVkZSAiSFRNTFN0YWNrSXRlbS5oIgorI2luY2x1ZGUgIkhUTUxUZW1wbGF0ZUVsZW1l bnQuaCIKICNpbmNsdWRlICJIVE1MVG9rZW4uaCIKICNpbmNsdWRlICJIVE1MVG9rZW5pemVyLmgi CiAjaW5jbHVkZSAiTG9jYWxpemVkU3RyaW5ncy5oIgpAQCAtMTU4Nyw3ICsxNTg4LDE0IEBAIHZv aWQgSFRNTFRyZWVCdWlsZGVyOjpjYWxsVGhlQWRvcHRpb25BZ2VuY3koQXRvbWljSFRNTFRva2Vu KiB0b2tlbikKICAgICAgICAgaWYgKGNvbW1vbkFuY2VzdG9yLT5jYXVzZXNGb3N0ZXJQYXJlbnRp bmcoKSkKICAgICAgICAgICAgIG1fdHJlZS5mb3N0ZXJQYXJlbnQobGFzdE5vZGUtPmVsZW1lbnQo KSk7CiAgICAgICAgIGVsc2UgeworI2lmIEVOQUJMRShURU1QTEFURV9FTEVNRU5UKQorICAgICAg ICAgICAgaWYgKGNvbW1vbkFuY2VzdG9yLT5oYXNUYWdOYW1lKHRlbXBsYXRlVGFnKSkKKyAgICAg ICAgICAgICAgICB0b0hUTUxUZW1wbGF0ZUVsZW1lbnQoY29tbW9uQW5jZXN0b3ItPm5vZGUoKSkt PmNvbnRlbnQoKS0+cGFyc2VyQXBwZW5kQ2hpbGQobGFzdE5vZGUtPmVsZW1lbnQoKSk7CisgICAg ICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgY29tbW9uQW5jZXN0b3ItPm5vZGUoKS0+cGFy c2VyQXBwZW5kQ2hpbGQobGFzdE5vZGUtPmVsZW1lbnQoKSk7CisjZWxzZQogICAgICAgICAgICAg Y29tbW9uQW5jZXN0b3ItPm5vZGUoKS0+cGFyc2VyQXBwZW5kQ2hpbGQobGFzdE5vZGUtPmVsZW1l bnQoKSk7CisjZW5kaWYKICAgICAgICAgICAgIEFTU0VSVChsYXN0Tm9kZS0+c3RhY2tJdGVtKCkt PmlzRWxlbWVudE5vZGUoKSk7CiAgICAgICAgICAgICBBU1NFUlQobGFzdE5vZGUtPmVsZW1lbnQo KS0+cGFyZW50Tm9kZSgpKTsKICAgICAgICAgICAgIGlmIChsYXN0Tm9kZS0+ZWxlbWVudCgpLT5w YXJlbnROb2RlKCktPmF0dGFjaGVkKCkgJiYgIWxhc3ROb2RlLT5lbGVtZW50KCktPmF0dGFjaGVk KCkpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggMjllZWNhMzdiNDllMTNkZDU5ZDU5NjI1ZGE3MTg1ZjkxMmQ2ODQ0NC4uMTA5 MjlmMDgyZjBlODgyMDI5MGMyNjQ2NTY4OTBlZjE4YTY2YWQ0MiAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDEzLTAxLTMwICBSYWZhZWwgV2VpbnN0ZWluICA8cmFmYWVsd0BjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgW0hUTUxUZW1wbGF0ZUVsZW1lbnRdIHByZXZlbnQgdGhlIHBhcnNlciBmcm9t IHJlbW92aW5nIG5vZGVzIGZyb20gdGhlIGNvbnRlbnQgd2hlbiB0aGUgZm9zdGVyIGFnZW5jeSBp cyBwcm9jZXNzaW5nIGZvcm1hdHRpbmcgZWxlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwODM3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vdGUgdGhhdCBkdW1wLWFzLW1hcmt1cC5qcyBpcyBt b2RpZmllZCBoZXJlIHRvIHB1dCBib3RoIHRlbXBsYXRlIGNvbnRlbnQgYW5kIGl0cyBkaXJlY3Qg Y2hpbGRyZW4uIFRoaXMgd2FzIGFuIG92ZXJzaXRlIGFuZCBmaXhpbmcgaXQgd2lsbCBtYWtlIGl0 CisgICAgICAgIGVhc2llciB0byBzcG90IHBhcnNlIGVycm9ycyBsaWtlIG9uZXMgdGhhdCBhcmlz ZSBmcm9tIHRoaXMgYnVnLCB3aGVyZSBub2RlcyBhcmUgYXBwZW5kZWQgZGlyZWN0bHkgdG8gdGhl IHRlbXBsYXRlIGVsZW1lbnQuCisKKyAgICAgICAgKiBodG1sNWxpYi9yZXNvdXJjZXMvdGVtcGxh dGUuZGF0OgorICAgICAgICAqIHJlc291cmNlcy9kdW1wLWFzLW1hcmt1cC5qczoKKyAgICAgICAg KE1hcmt1cC5fZ2V0KToKKwogMjAxMy0wMS0zMCAgVG9ueSBDaGFuZyAgPHRvbnlAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjEzNjMyNCk6IEZsZXhib3ggc2hvdWxkIHJlbGF5 b3V0IGZsZXggY2hpbGRyZW4gd2hlbiB3aWR0aCBjaGFuZ2VzCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9odG1sNWxpYi9yZXNvdXJjZXMvdGVtcGxhdGUuZGF0IGIvTGF5b3V0VGVzdHMvaHRtbDVs aWIvcmVzb3VyY2VzL3RlbXBsYXRlLmRhdAppbmRleCA2NmZiZTIwZDQ1ZWY1MjUyZmRjMjAyZWMw MzAxZDBhZTgxZDZiOTg2Li42YmJkNDg3M2FmMTgyNmRiMGU2MTdjNjBlNTUxNzVkODAwNmZiNmMz IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odG1sNWxpYi9yZXNvdXJjZXMvdGVtcGxhdGUuZGF0 CisrKyBiL0xheW91dFRlc3RzL2h0bWw1bGliL3Jlc291cmNlcy90ZW1wbGF0ZS5kYXQKQEAgLTk0 MSwzICs5NDEsMTcgQEAKIHwgICAgIDx0ZW1wbGF0ZT4KIHwgICAgICAgI2RvY3VtZW50LWZyYWdt ZW50CiB8ICAgICAgICAgPGNvbD4KKworI2RhdGEKKzxib2R5Pjx0ZW1wbGF0ZT48aT48bWVudT5G b288L2k+CisjZXJyb3JzCisjZG9jdW1lbnQKK3wgPGh0bWw+Cit8ICAgPGhlYWQ+Cit8ICAgPGJv ZHk+Cit8ICAgICA8dGVtcGxhdGU+Cit8ICAgICAgICNkb2N1bWVudC1mcmFnbWVudAorfCAgICAg ICAgIDxpPgorfCAgICAgICAgIDxtZW51PgorfCAgICAgICAgICAgPGk+Cit8ICAgICAgICAgICAg ICJGb28iCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9yZXNvdXJjZXMvZHVtcC1hcy1tYXJrdXAu anMgYi9MYXlvdXRUZXN0cy9yZXNvdXJjZXMvZHVtcC1hcy1tYXJrdXAuanMKaW5kZXggNDM3YmU2 Y2YzMGE4Yzg4MDNhMmE4ZWZjOWZkODAzYzI0ZDUzODJlYi4uZTJhNjk3NTlhZTE1NGE1NmIyZTVi ZTAxZjQ1YTNjYTIyNTRiNzYyMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcmVzb3VyY2VzL2R1 bXAtYXMtbWFya3VwLmpzCisrKyBiL0xheW91dFRlc3RzL3Jlc291cmNlcy9kdW1wLWFzLW1hcmt1 cC5qcwpAQCAtMjI0LDE5ICsyMjQsMTYgQEAgTWFya3VwLl9nZXQgPSBmdW5jdGlvbihub2RlLCBk ZXB0aCwgc2hhZG93Um9vdExpc3QpCiAgICAgICAgIGVsc2UKICAgICAgICAgICBzdHIgKz0gIiNk b2N1bWVudC1mcmFnbWVudCI7CiAgICAgfQotICAgIAotICAgIAotICAgIC8vIEhUTUwgVGVtcGxh dGUgZWxlbWVudHMgc2VyaWFsaXplIHRoZWlyIGNvbnRlbnQgRG9jdW1lbnRGcmFnbWVudCwgYW5k IE5PVCB0aGVpciBjaGlsZHJlbi4KLSAgICBpZiAobm9kZS5uYW1lc3BhY2VVUkkgPSAnaHR0cDov L3d3dy53My5vcmcvMTk5OS94aHRtbCcgJiYgbm9kZS50YWdOYW1lID09ICdURU1QTEFURScpIHsK KworICAgIGlmIChub2RlLm5hbWVzcGFjZVVSSSA9ICdodHRwOi8vd3d3LnczLm9yZy8xOTk5L3ho dG1sJyAmJiBub2RlLnRhZ05hbWUgPT0gJ1RFTVBMQVRFJykKICAgICAgICAgc3RyICs9IE1hcmt1 cC5fZ2V0KG5vZGUuY29udGVudCwgZGVwdGggKyAxLCBzaGFkb3dSb290TGlzdCk7Ci0gICAgfSBl bHNlIHsKLSAgICAgICAgZm9yICh2YXIgaSA9IDAsIGxlbiA9IG5vZGUuY2hpbGROb2Rlcy5sZW5n dGg7IGkgPCBsZW47IGkrKykgewotICAgICAgICAgICAgdmFyIHNlbGVjdGlvbiA9IE1hcmt1cC5f Z2V0U2VsZWN0aW9uTWFya2VyKG5vZGUsIGkpOwotICAgICAgICAgICAgaWYgKHNlbGVjdGlvbikK LSAgICAgICAgICAgICAgICBzdHIgKz0gTWFya3VwLl9pbmRlbnQoZGVwdGggKyAxKSArIHNlbGVj dGlvbjsKLSAgICAKLSAgICAgICAgICAgIHN0ciArPSBNYXJrdXAuX2dldChub2RlLmNoaWxkTm9k ZXNbaV0sIGRlcHRoICsgMSwgc2hhZG93Um9vdExpc3QpOwotICAgICAgICB9CisKKyAgICBmb3Ig KHZhciBpID0gMCwgbGVuID0gbm9kZS5jaGlsZE5vZGVzLmxlbmd0aDsgaSA8IGxlbjsgaSsrKSB7 CisgICAgICAgIHZhciBzZWxlY3Rpb24gPSBNYXJrdXAuX2dldFNlbGVjdGlvbk1hcmtlcihub2Rl LCBpKTsKKyAgICAgICAgaWYgKHNlbGVjdGlvbikKKyAgICAgICAgICAgIHN0ciArPSBNYXJrdXAu X2luZGVudChkZXB0aCArIDEpICsgc2VsZWN0aW9uOworCisgICAgICAgIHN0ciArPSBNYXJrdXAu X2dldChub2RlLmNoaWxkTm9kZXNbaV0sIGRlcHRoICsgMSwgc2hhZG93Um9vdExpc3QpOwogICAg IH0KICAgICAKICAgICBzdHIgKz0gTWFya3VwLl9nZXRTaGFkb3dIb3N0SWZQb3NzaWJsZShub2Rl LCBkZXB0aCwgc2hhZG93Um9vdExpc3QpOwo= 185576 2013-01-30 14:31:35 -0800 2013-01-30 15:13:25 -0800 Patch bug-108377-20130130142820.patch text/plain 7131 rafaelw U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTg2NTc2ZWJjM2Q2ODhm NGVlMDUwOTNmYmE4M2FlYjZhODczNTc4ZS4uOWVmZGZjMTZkMWM2MDY4YTNlZjQzZGIxNjhjY2Ew OTk5ZTY5MjgyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTAxLTMwICBSYWZh ZWwgV2VpbnN0ZWluICA8cmFmYWVsd0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0hUTUxUZW1w bGF0ZUVsZW1lbnRdIHByZXZlbnQgdGhlIHBhcnNlciBmcm9tIHJlbW92aW5nIG5vZGVzIGZyb20g dGhlIGNvbnRlbnQgd2hlbiB0aGUgZm9zdGVyIGFnZW5jeSBpcyBwcm9jZXNzaW5nIGZvcm1hdHRp bmcgZWxlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEwODM3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIGh0dHBzOi8vZHZjcy53My5vcmcvaGcvd2ViY29tcG9uZW50cy9yYXctZmlsZS81MGNlMWYz NjhjMWEvc3BlYy90ZW1wbGF0ZXMvaW5kZXguaHRtbCNpbi1ib2R5LWFkZGl0aW9uCisKKyAgICAg ICAgY2FsbFRoZUFkb3B0aW9uQWdlbmN5IG5vdyBhcHBlbmRzIHRvIHRoZSB0ZW1wbGF0ZSdzIGNv bnRlbnQgd2hlbiBpdCBwcmV2aW91c2x5IHdvdWxkIGhhdmUgYXBwZW5kZWQgdG8gdGhlIHRlbXBs YXRlIGVsZW1lbnQgaXRzZWxmLgorCisgICAgICAgIE5ldyB0ZXN0IGFkZGVkIHRvIGh0bWw1bGli LgorCisgICAgICAgICogZG9tL0NvbnRhaW5lck5vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Q29udGFpbmVyTm9kZTo6cGFyc2VySW5zZXJ0QmVmb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OkNv bnRhaW5lck5vZGU6OnBhcnNlckFwcGVuZENoaWxkKToKKyAgICAgICAgKiBodG1sL3BhcnNlci9I VE1MVHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVCdWlsZGVyOjpj YWxsVGhlQWRvcHRpb25BZ2VuY3kpOgorCiAyMDEzLTAxLTMwICBUb255IENoYW5nICA8dG9ueUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMTM2MzI0KTogRmxleGJveCBzaG91 bGQgcmVsYXlvdXQgZmxleCBjaGlsZHJlbiB3aGVuIHdpZHRoIGNoYW5nZXMKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2RvbS9Db250YWluZXJOb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9Db250YWluZXJOb2RlLmNwcAppbmRleCBkNGY3MWI4YTFhYmVmMzE2NjYxYzkxNTExNGZlM2Q4 ODFlOTgxOWVlLi41NjRkOWQyOTlmZjhkZTJhY2NhN2VhM2ZkNGM4MDE4M2Q0ZTYzYjZkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vQ29udGFpbmVyTm9kZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuY3BwCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVk ZSAiRmxvYXRSZWN0LmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJGcmFtZVZpZXcu aCIKKyNpbmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJJbmxpbmVUZXh0Qm94LmgiCiAj aW5jbHVkZSAiSW5zZXJ0aW9uUG9pbnQuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JJbnN0cnVtZW50 YXRpb24uaCIKQEAgLTMyOSw2ICszMzAsOSBAQCB2b2lkIENvbnRhaW5lck5vZGU6OnBhcnNlcklu c2VydEJlZm9yZShQYXNzUmVmUHRyPE5vZGU+IG5ld0NoaWxkLCBOb2RlKiBuZXh0Q2hpbAogICAg IEFTU0VSVChuZXh0Q2hpbGQpOwogICAgIEFTU0VSVChuZXh0Q2hpbGQtPnBhcmVudE5vZGUoKSA9 PSB0aGlzKTsKICAgICBBU1NFUlQoIW5ld0NoaWxkLT5pc0RvY3VtZW50RnJhZ21lbnQoKSk7Cisj aWYgRU5BQkxFKFRFTVBMQVRFX0VMRU1FTlQpCisgICAgQVNTRVJUKCFoYXNUYWdOYW1lKEhUTUxO YW1lczo6dGVtcGxhdGVUYWcpKTsKKyNlbmRpZgogCiAgICAgaWYgKG5leHRDaGlsZC0+cHJldmlv dXNTaWJsaW5nKCkgPT0gbmV3Q2hpbGQgfHwgbmV4dENoaWxkID09IG5ld0NoaWxkKSAvLyBub3Ro aW5nIHRvIGRvCiAgICAgICAgIHJldHVybjsKQEAgLTY5Nyw2ICs3MDEsOSBAQCB2b2lkIENvbnRh aW5lck5vZGU6OnBhcnNlckFwcGVuZENoaWxkKFBhc3NSZWZQdHI8Tm9kZT4gbmV3Q2hpbGQpCiAg ICAgQVNTRVJUKG5ld0NoaWxkKTsKICAgICBBU1NFUlQoIW5ld0NoaWxkLT5wYXJlbnROb2RlKCkp OyAvLyBVc2UgYXBwZW5kQ2hpbGQgaWYgeW91IG5lZWQgdG8gaGFuZGxlIHJlcGFyZW50aW5nIChh bmQgd2FudCBET00gbXV0YXRpb24gZXZlbnRzKS4KICAgICBBU1NFUlQoIW5ld0NoaWxkLT5pc0Rv Y3VtZW50RnJhZ21lbnQoKSk7CisjaWYgRU5BQkxFKFRFTVBMQVRFX0VMRU1FTlQpCisgICAgQVNT RVJUKCFoYXNUYWdOYW1lKEhUTUxOYW1lczo6dGVtcGxhdGVUYWcpKTsKKyNlbmRpZgogCiAgICAg aWYgKGRvY3VtZW50KCkgIT0gbmV3Q2hpbGQtPmRvY3VtZW50KCkpCiAgICAgICAgIGRvY3VtZW50 KCktPmFkb3B0Tm9kZShuZXdDaGlsZC5nZXQoKSwgQVNTRVJUX05PX0VYQ0VQVElPTik7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRyZWVCdWlsZGVyLmNwcAppbmRleCBjNzAx MTlkNzI0ZTNjZThiMGZhMDEzMjdhMTI1ODEwYzA3NzBlN2M3Li43ODMxM2VlMzE2ZTI5MGE4MzQ4 MjM2ZDlmY2RmOTVmM2FkN2ZjYWZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3Bh cnNlci9IVE1MVHJlZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2Vy L0hUTUxUcmVlQnVpbGRlci5jcHAKQEAgLTM0LDYgKzM0LDcgQEAKICNpbmNsdWRlICJIVE1MTmFt ZXMuaCIKICNpbmNsdWRlICJIVE1MUGFyc2VySWRpb21zLmgiCiAjaW5jbHVkZSAiSFRNTFN0YWNr SXRlbS5oIgorI2luY2x1ZGUgIkhUTUxUZW1wbGF0ZUVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1M VG9rZW4uaCIKICNpbmNsdWRlICJIVE1MVG9rZW5pemVyLmgiCiAjaW5jbHVkZSAiTG9jYWxpemVk U3RyaW5ncy5oIgpAQCAtMTU4Nyw3ICsxNTg4LDE0IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpj YWxsVGhlQWRvcHRpb25BZ2VuY3koQXRvbWljSFRNTFRva2VuKiB0b2tlbikKICAgICAgICAgaWYg KGNvbW1vbkFuY2VzdG9yLT5jYXVzZXNGb3N0ZXJQYXJlbnRpbmcoKSkKICAgICAgICAgICAgIG1f dHJlZS5mb3N0ZXJQYXJlbnQobGFzdE5vZGUtPmVsZW1lbnQoKSk7CiAgICAgICAgIGVsc2Ugewor I2lmIEVOQUJMRShURU1QTEFURV9FTEVNRU5UKQorICAgICAgICAgICAgaWYgKGNvbW1vbkFuY2Vz dG9yLT5oYXNUYWdOYW1lKHRlbXBsYXRlVGFnKSkKKyAgICAgICAgICAgICAgICB0b0hUTUxUZW1w bGF0ZUVsZW1lbnQoY29tbW9uQW5jZXN0b3ItPm5vZGUoKSktPmNvbnRlbnQoKS0+cGFyc2VyQXBw ZW5kQ2hpbGQobGFzdE5vZGUtPmVsZW1lbnQoKSk7CisgICAgICAgICAgICBlbHNlCisgICAgICAg ICAgICAgICAgY29tbW9uQW5jZXN0b3ItPm5vZGUoKS0+cGFyc2VyQXBwZW5kQ2hpbGQobGFzdE5v ZGUtPmVsZW1lbnQoKSk7CisjZWxzZQogICAgICAgICAgICAgY29tbW9uQW5jZXN0b3ItPm5vZGUo KS0+cGFyc2VyQXBwZW5kQ2hpbGQobGFzdE5vZGUtPmVsZW1lbnQoKSk7CisjZW5kaWYKICAgICAg ICAgICAgIEFTU0VSVChsYXN0Tm9kZS0+c3RhY2tJdGVtKCktPmlzRWxlbWVudE5vZGUoKSk7CiAg ICAgICAgICAgICBBU1NFUlQobGFzdE5vZGUtPmVsZW1lbnQoKS0+cGFyZW50Tm9kZSgpKTsKICAg ICAgICAgICAgIGlmIChsYXN0Tm9kZS0+ZWxlbWVudCgpLT5wYXJlbnROb2RlKCktPmF0dGFjaGVk KCkgJiYgIWxhc3ROb2RlLT5lbGVtZW50KCktPmF0dGFjaGVkKCkpCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMjllZWNhMzdi NDllMTNkZDU5ZDU5NjI1ZGE3MTg1ZjkxMmQ2ODQ0NC4uNDQzOWY0NGQ2OGM0NWNiZTcyYzVlNmJl MzIzNWMzYTE2ZmZmMjA4YiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAxLTMwICBSYWZh ZWwgV2VpbnN0ZWluICA8cmFmYWVsd0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0hUTUxUZW1w bGF0ZUVsZW1lbnRdIHByZXZlbnQgdGhlIHBhcnNlciBmcm9tIHJlbW92aW5nIG5vZGVzIGZyb20g dGhlIGNvbnRlbnQgd2hlbiB0aGUgZm9zdGVyIGFnZW5jeSBpcyBwcm9jZXNzaW5nIGZvcm1hdHRp bmcgZWxlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEwODM3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE5vdGUgdGhhdCBkdW1wLWFzLW1hcmt1cC5qcyBpcyBtb2RpZmllZCBoZXJlIHRvIHB1dCBi b3RoIHRlbXBsYXRlIGNvbnRlbnQgYW5kIGl0cyBkaXJlY3QgY2hpbGRyZW4uIFRoaXMgd2FzIGFu IG92ZXJzaWdodCBhbmQgZml4aW5nIGl0IHdpbGwgbWFrZSBpdAorICAgICAgICBlYXNpZXIgdG8g c3BvdCBwYXJzZSBlcnJvcnMgbGlrZSBvbmVzIHRoYXQgYXJpc2UgZnJvbSB0aGlzIGJ1Zywgd2hl cmUgbm9kZXMgYXJlIGFwcGVuZGVkIGRpcmVjdGx5IHRvIHRoZSB0ZW1wbGF0ZSBlbGVtZW50Lgor CisgICAgICAgICogaHRtbDVsaWIvcmVzb3VyY2VzL3RlbXBsYXRlLmRhdDoKKyAgICAgICAgKiBy ZXNvdXJjZXMvZHVtcC1hcy1tYXJrdXAuanM6CisgICAgICAgIChNYXJrdXAuX2dldCk6CisKIDIw MTMtMDEtMzAgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSRUdS RVNTSU9OKHIxMzYzMjQpOiBGbGV4Ym94IHNob3VsZCByZWxheW91dCBmbGV4IGNoaWxkcmVuIHdo ZW4gd2lkdGggY2hhbmdlcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHRtbDVsaWIvcmVzb3Vy Y2VzL3RlbXBsYXRlLmRhdCBiL0xheW91dFRlc3RzL2h0bWw1bGliL3Jlc291cmNlcy90ZW1wbGF0 ZS5kYXQKaW5kZXggNjZmYmUyMGQ0NWVmNTI1MmZkYzIwMmVjMDMwMWQwYWU4MWQ2Yjk4Ni4uNmJi ZDQ4NzNhZjE4MjZkYjBlNjE3YzYwZTU1MTc1ZDgwMDZmYjZjMyAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvaHRtbDVsaWIvcmVzb3VyY2VzL3RlbXBsYXRlLmRhdAorKysgYi9MYXlvdXRUZXN0cy9o dG1sNWxpYi9yZXNvdXJjZXMvdGVtcGxhdGUuZGF0CkBAIC05NDEsMyArOTQxLDE3IEBACiB8ICAg ICA8dGVtcGxhdGU+CiB8ICAgICAgICNkb2N1bWVudC1mcmFnbWVudAogfCAgICAgICAgIDxjb2w+ CisKKyNkYXRhCis8Ym9keT48dGVtcGxhdGU+PGk+PG1lbnU+Rm9vPC9pPgorI2Vycm9ycworI2Rv Y3VtZW50Cit8IDxodG1sPgorfCAgIDxoZWFkPgorfCAgIDxib2R5PgorfCAgICAgPHRlbXBsYXRl PgorfCAgICAgICAjZG9jdW1lbnQtZnJhZ21lbnQKK3wgICAgICAgICA8aT4KK3wgICAgICAgICA8 bWVudT4KK3wgICAgICAgICAgIDxpPgorfCAgICAgICAgICAgICAiRm9vIgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvcmVzb3VyY2VzL2R1bXAtYXMtbWFya3VwLmpzIGIvTGF5b3V0VGVzdHMvcmVz b3VyY2VzL2R1bXAtYXMtbWFya3VwLmpzCmluZGV4IDQzN2JlNmNmMzBhOGM4ODAzYTJhOGVmYzlm ZDgwM2MyNGQ1MzgyZWIuLmUyYTY5NzU5YWUxNTRhNTZiMmU1YmUwMWY0NWEzY2EyMjU0Yjc2MjMg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3Jlc291cmNlcy9kdW1wLWFzLW1hcmt1cC5qcworKysg Yi9MYXlvdXRUZXN0cy9yZXNvdXJjZXMvZHVtcC1hcy1tYXJrdXAuanMKQEAgLTIyNCwxOSArMjI0 LDE2IEBAIE1hcmt1cC5fZ2V0ID0gZnVuY3Rpb24obm9kZSwgZGVwdGgsIHNoYWRvd1Jvb3RMaXN0 KQogICAgICAgICBlbHNlCiAgICAgICAgICAgc3RyICs9ICIjZG9jdW1lbnQtZnJhZ21lbnQiOwog ICAgIH0KLSAgICAKLSAgICAKLSAgICAvLyBIVE1MIFRlbXBsYXRlIGVsZW1lbnRzIHNlcmlhbGl6 ZSB0aGVpciBjb250ZW50IERvY3VtZW50RnJhZ21lbnQsIGFuZCBOT1QgdGhlaXIgY2hpbGRyZW4u Ci0gICAgaWYgKG5vZGUubmFtZXNwYWNlVVJJID0gJ2h0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0 bWwnICYmIG5vZGUudGFnTmFtZSA9PSAnVEVNUExBVEUnKSB7CisKKyAgICBpZiAobm9kZS5uYW1l c3BhY2VVUkkgPSAnaHR0cDovL3d3dy53My5vcmcvMTk5OS94aHRtbCcgJiYgbm9kZS50YWdOYW1l ID09ICdURU1QTEFURScpCiAgICAgICAgIHN0ciArPSBNYXJrdXAuX2dldChub2RlLmNvbnRlbnQs IGRlcHRoICsgMSwgc2hhZG93Um9vdExpc3QpOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIGZvciAo dmFyIGkgPSAwLCBsZW4gPSBub2RlLmNoaWxkTm9kZXMubGVuZ3RoOyBpIDwgbGVuOyBpKyspIHsK LSAgICAgICAgICAgIHZhciBzZWxlY3Rpb24gPSBNYXJrdXAuX2dldFNlbGVjdGlvbk1hcmtlcihu b2RlLCBpKTsKLSAgICAgICAgICAgIGlmIChzZWxlY3Rpb24pCi0gICAgICAgICAgICAgICAgc3Ry ICs9IE1hcmt1cC5faW5kZW50KGRlcHRoICsgMSkgKyBzZWxlY3Rpb247Ci0gICAgCi0gICAgICAg ICAgICBzdHIgKz0gTWFya3VwLl9nZXQobm9kZS5jaGlsZE5vZGVzW2ldLCBkZXB0aCArIDEsIHNo YWRvd1Jvb3RMaXN0KTsKLSAgICAgICAgfQorCisgICAgZm9yICh2YXIgaSA9IDAsIGxlbiA9IG5v ZGUuY2hpbGROb2Rlcy5sZW5ndGg7IGkgPCBsZW47IGkrKykgeworICAgICAgICB2YXIgc2VsZWN0 aW9uID0gTWFya3VwLl9nZXRTZWxlY3Rpb25NYXJrZXIobm9kZSwgaSk7CisgICAgICAgIGlmIChz ZWxlY3Rpb24pCisgICAgICAgICAgICBzdHIgKz0gTWFya3VwLl9pbmRlbnQoZGVwdGggKyAxKSAr IHNlbGVjdGlvbjsKKworICAgICAgICBzdHIgKz0gTWFya3VwLl9nZXQobm9kZS5jaGlsZE5vZGVz W2ldLCBkZXB0aCArIDEsIHNoYWRvd1Jvb3RMaXN0KTsKICAgICB9CiAgICAgCiAgICAgc3RyICs9 IE1hcmt1cC5fZ2V0U2hhZG93SG9zdElmUG9zc2libGUobm9kZSwgZGVwdGgsIHNoYWRvd1Jvb3RM aXN0KTsK