41503 2010-07-01 22:20:29 -0700 Implement processFakePEndTagIfPInScope 2010-07-02 18:58:13 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 41123 1 abarth abarth commit-queue eric oldest_to_newest 245761 0 abarth 2010-07-01 22:20:29 -0700 Implement processFakePEndTagIfPInScope 245762 1 60335 abarth 2010-07-01 22:22:15 -0700 Created attachment 60335 Patch 245800 2 60335 eric 2010-07-02 00:51:31 -0700 Comment on attachment 60335 Patch WebCore/html/HTMLTreeBuilder.cpp:313 + if (!m_openElements.inScope(pTag.localName())) This is sad. We'll add a QualifiedName version. WebCore/html/HTMLTreeBuilder.cpp:315 + AtomicHTMLToken endP(HTMLToken::EndTag, pTag.localName()); We need an function to handle this token creation for us. I think AtomicHTMLTokens should be copyable and that would simplify a lot of this code. 245859 3 60335 commit-queue 2010-07-02 03:26:38 -0700 Comment on attachment 60335 Patch Clearing flags on attachment: 60335 Committed r62376: <http://trac.webkit.org/changeset/62376> 245860 4 commit-queue 2010-07-02 03:26:43 -0700 All reviewed patches have been landed. Closing bug. 246185 5 abarth 2010-07-02 18:58:13 -0700 > This is sad. We'll add a QualifiedName version. Ok. > WebCore/html/HTMLTreeBuilder.cpp:315 > + AtomicHTMLToken endP(HTMLToken::EndTag, pTag.localName()); > We need an function to handle this token creation for us. I think AtomicHTMLTokens should be copyable and that would simplify a lot of this code. I don't understand how copyable tokens would help here. The P end tag gets invented out of whole cloth. 60335 2010-07-01 22:22:15 -0700 2010-07-02 03:26:38 -0700 Patch bug-41503-20100701222203.patch text/plain 11180 abarth ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwOGM4MmNkZjFlMzJkZjliZDgxNDYyZDU4ZmYwODNjNTgxODAwMzVlLi45YzhiYjE1 ZjE1YjNlZGI3NzI0ZjA3YjIyOGNmMWQxZjgxZjM5MTlhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMTcgQEAK IAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBJbXBsZW1l bnQgcHJvY2Vzc0Zha2VQRW5kVGFnSWZQSW5TY29wZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDE1MDMKKworICAgICAgICBTZWUgdGVzdCBwcm9ncmVz c2lvbi4KKworICAgICAgICAqIGh0bWw1bGliL3J1bm5lci1leHBlY3RlZC1odG1sNS50eHQ6CisK KzIwMTAtMDctMDEgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBIYW5kbGUgPGJhc2U+IGFuZCBm cmllbmRzIGluIEFmdGVySGVhZE1vZGUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTQxNTAyCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0bWw1bGli L3J1bm5lci1leHBlY3RlZC1odG1sNS50eHQgYi9MYXlvdXRUZXN0cy9odG1sNWxpYi9ydW5uZXIt ZXhwZWN0ZWQtaHRtbDUudHh0CmluZGV4IDE5MDkyNzI0MDliNGZiY2NjMDI2ZTRjOWVhOWZkOTk1 NTZlNDFmM2MuLjFiNGYxZWUyZmY1NzQ5M2VmYjliNWViNmI0MWJjMzhmZWUyYTdkYmIgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL2h0bWw1bGliL3J1bm5lci1leHBlY3RlZC1odG1sNS50eHQKKysr IGIvTGF5b3V0VGVzdHMvaHRtbDVsaWIvcnVubmVyLWV4cGVjdGVkLWh0bWw1LnR4dApAQCAtMywx NCArMywxMiBAQCBDT05TT0xFIE1FU1NBR0U6IGxpbmUgMjogUEFTUwogQ09OU09MRSBNRVNTQUdF OiBsaW5lIDI6IEZPTzxzcGFuPkJBUjwvc3Bhbj5CQVoKIENvbnRlbnQtVHlwZTogdGV4dC9wbGFp bgogcmVzb3VyY2VzL3Rlc3RzMS5kYXQ6Ci0yCiAyMAogMjEKIDIyCiAyMwogMjQKIDI1Ci0yNgog MjgKIDI5CiAzMApAQCAtMjAsNyArMTgsNiBAQCByZXNvdXJjZXMvdGVzdHMxLmRhdDoKIDM0CiA1 MAogNTEKLTUyCiA1MwogNTYKIDU3CkBAIC01Miw3ICs0OSw2IEBAIHJlc291cmNlcy90ZXN0czEu ZGF0OgogOTYKIDk3CiA5OAotOTkKIDEwMAogMTAxCiAxMDMKQEAgLTY1LDI1ICs2MSw2IEBAIHJl c291cmNlcy90ZXN0czEuZGF0OgogMTExCiAxMTIKIAotVGVzdCAyIG9mIDExMyBpbiByZXNvdXJj ZXMvdGVzdHMxLmRhdCBmYWlsZWQuIElucHV0OgotPHA+T25lPHA+VHdvCi1Hb3Q6Ci18IDxodG1s PgotfCAgIDxoZWFkPgotfCAgIDxib2R5PgotfCAgICAgPHA+Ci18ICAgICAgICJPbmUiCi18ICAg ICAgIDxwPgotfCAgICAgICAgICJUd28iCi1FeHBlY3RlZDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+ Ci18ICAgPGJvZHk+Ci18ICAgICA8cD4KLXwgICAgICAgIk9uZSIKLXwgICAgIDxwPgotfCAgICAg ICAiVHdvIgotCiBUZXN0IDIwIG9mIDExMyBpbiByZXNvdXJjZXMvdGVzdHMxLmRhdCBmYWlsZWQu IElucHV0OgogPGI+PHRhYmxlPjx0ZD48aT48L3RhYmxlPgogR290OgpAQCAtMTkxLDEwICsxNjgs OSBAQCBHb3Q6CiB8ICAgPGJvZHk+CiB8ICAgICA8cD4KIHwgICAgICAgPGI+Ci18ICAgICAgICAg PGRpdj4KLXwgICAgICAgICAgIDxiPgotfCAgICAgICAgICAgICA8bWFycXVlZT4KLXwgICAgICAg ICAgICAgICAiWCIKK3wgICAgIDxkaXY+Cit8ICAgICAgIDxtYXJxdWVlPgorfCAgICAgICAgICJY IgogRXhwZWN0ZWQ6CiB8IDxodG1sPgogfCAgIDxoZWFkPgpAQCAtMjA3LDI5ICsxODMsNiBAQCBF eHBlY3RlZDoKIHwgICAgICAgICAgIDxwPgogfCAgICAgICAgICAgIlgiCiAKLVRlc3QgMjYgb2Yg MTEzIGluIHJlc291cmNlcy90ZXN0czEuZGF0IGZhaWxlZC4gSW5wdXQ6Ci08c2NyaXB0PjxkaXY+ PC9zY3JpcHQ+PC9kaXY+PHRpdGxlPjxwPjwvdGl0bGU+PHA+PHA+Ci1Hb3Q6Ci18IDxodG1sPgot fCAgIDxoZWFkPgotfCAgICAgPHNjcmlwdD4KLXwgICAgICAgIjxkaXY+IgotfCAgICAgPHRpdGxl PgotfCAgICAgICAiPHA+IgotfCAgIDxib2R5PgotfCAgICAgPHA+Ci18ICAgICAgIDxwPgotRXhw ZWN0ZWQ6Ci18IDxodG1sPgotfCAgIDxoZWFkPgotfCAgICAgPHNjcmlwdD4KLXwgICAgICAgIjxk aXY+IgotfCAgICAgPHRpdGxlPgotfCAgICAgICAiPHA+IgotfCAgIDxib2R5PgotfCAgICAgPHA+ Ci18ICAgICA8cD4KLQogVGVzdCAyOCBvZiAxMTMgaW4gcmVzb3VyY2VzL3Rlc3RzMS5kYXQgZmFp bGVkLiBJbnB1dDoKIDxwPjxocj48L3A+CiBHb3Q6CkBAIC0yMzcsNyArMTkwLDcgQEAgR290Ogog fCAgIDxoZWFkPgogfCAgIDxib2R5PgogfCAgICAgPHA+Ci18ICAgICAgIDxocj4KK3wgICAgIDxo cj4KIEV4cGVjdGVkOgogfCA8aHRtbD4KIHwgICA8aGVhZD4KQEAgLTQ0OCwyOSArNDAxLDYgQEAg RXhwZWN0ZWQ6CiB8ICAgICAgIDxiPgogfCAgICAgICAiVEVTVCIKIAotVGVzdCA1MiBvZiAxMTMg aW4gcmVzb3VyY2VzL3Rlc3RzMS5kYXQgZmFpbGVkLiBJbnB1dDoKLTxwIGlkPWE+PGI+PHAgaWQ9 Yj48L2I+VEVTVAotR290OgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAg IDxwPgotfCAgICAgICBpZD0iYSIKLXwgICAgICAgPGI+Ci18ICAgICAgICAgPHA+Ci18ICAgICAg ICAgICBpZD0iYiIKLXwgICAgICAgICAgICJURVNUIgotRXhwZWN0ZWQ6Ci18IDxodG1sPgotfCAg IDxoZWFkPgotfCAgIDxib2R5PgotfCAgICAgPHA+Ci18ICAgICAgIGlkPSJhIgotfCAgICAgICA8 Yj4KLXwgICAgIDxwPgotfCAgICAgICBpZD0iYiIKLXwgICAgICAgIlRFU1QiCi0KIFRlc3QgNTMg b2YgMTEzIGluIHJlc291cmNlcy90ZXN0czEuZGF0IGZhaWxlZC4gSW5wdXQ6CiA8YiBpZD1hPjxw PjxiIGlkPWI+PC9wPjwvYj5URVNUCiBHb3Q6CkBAIC0xMjUxLDkgKzExODEsOCBAQCBHb3Q6CiB8 ICAgPGJvZHk+CiB8ICAgICA8cD4KIHwgICAgICAgPGI+Ci18ICAgICAgICAgPGRpdj4KLXwgICAg ICAgICAgIDxiPgotfCAgICAgICAgICAgICA8bWFycXVlZT4KK3wgICAgIDxkaXY+Cit8ICAgICAg IDxtYXJxdWVlPgogRXhwZWN0ZWQ6CiB8IDxodG1sPgogfCAgIDxoZWFkPgpAQCAtMTI2NSwyNSAr MTE5NCw2IEBAIEV4cGVjdGVkOgogfCAgICAgICAgIDxtYXJxdWVlPgogfCAgICAgICAgICAgPHA+ CiAKLVRlc3QgOTkgb2YgMTEzIGluIHJlc291cmNlcy90ZXN0czEuZGF0IGZhaWxlZC4gSW5wdXQ6 Ci08c2NyaXB0Pjwvc2NyaXB0PjwvZGl2Pjx0aXRsZT48L3RpdGxlPjxwPjxwPgotR290OgotfCA8 aHRtbD4KLXwgICA8aGVhZD4KLXwgICAgIDxzY3JpcHQ+Ci18ICAgICA8dGl0bGU+Ci18ICAgPGJv ZHk+Ci18ICAgICA8cD4KLXwgICAgICAgPHA+Ci1FeHBlY3RlZDoKLXwgPGh0bWw+Ci18ICAgPGhl YWQ+Ci18ICAgICA8c2NyaXB0PgotfCAgICAgPHRpdGxlPgotfCAgIDxib2R5PgotfCAgICAgPHA+ Ci18ICAgICA8cD4KLQogVGVzdCAxMDAgb2YgMTEzIGluIHJlc291cmNlcy90ZXN0czEuZGF0IGZh aWxlZC4gSW5wdXQ6CiA8cD48aHI+PC9wPgogR290OgpAQCAtMTI5MSw3ICsxMjAxLDcgQEAgR290 OgogfCAgIDxoZWFkPgogfCAgIDxib2R5PgogfCAgICAgPHA+Ci18ICAgICAgIDxocj4KK3wgICAg IDxocj4KIEV4cGVjdGVkOgogfCA8aHRtbD4KIHwgICA8aGVhZD4KQEAgLTE1MjMsMTAgKzE0MzMs NiBAQCByZXNvdXJjZXMvdGVzdHMyLmRhdDoKIDkKIDExCiAxMwotMjQKLTI1Ci0yNgotMjcKIDMy CiAzNAogMzUKQEAgLTE2NTAsNzQgKzE1NTYsNiBAQCBFeHBlY3RlZDoKIHwgICAgICAgPHRib2R5 PgogfCAgICAgICAgIDx0cj4KIAotVGVzdCAyNCBvZiA1OSBpbiByZXNvdXJjZXMvdGVzdHMyLmRh dCBmYWlsZWQuIElucHV0OgotPCFkb2N0eXBlaHRtbD48cD48bGk+Ci1Hb3Q6Ci18IDwhRE9DVFlQ RSBodG1sPgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDxwPgotfCAg ICAgICA8bGk+Ci1FeHBlY3RlZDoKLXwgPCFET0NUWVBFIGh0bWw+Ci18IDxodG1sPgotfCAgIDxo ZWFkPgotfCAgIDxib2R5PgotfCAgICAgPHA+Ci18ICAgICA8bGk+Ci0KLVRlc3QgMjUgb2YgNTkg aW4gcmVzb3VyY2VzL3Rlc3RzMi5kYXQgZmFpbGVkLiBJbnB1dDoKLTwhZG9jdHlwZWh0bWw+PHA+ PGR0PgotR290OgotfCA8IURPQ1RZUEUgaHRtbD4KLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAg PGJvZHk+Ci18ICAgICA8cD4KLXwgICAgICAgPGR0PgotRXhwZWN0ZWQ6Ci18IDwhRE9DVFlQRSBo dG1sPgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDxwPgotfCAgICAg PGR0PgotCi1UZXN0IDI2IG9mIDU5IGluIHJlc291cmNlcy90ZXN0czIuZGF0IGZhaWxlZC4gSW5w dXQ6Ci08IWRvY3R5cGVodG1sPjxwPjxkZD4KLUdvdDoKLXwgPCFET0NUWVBFIGh0bWw+Ci18IDxo dG1sPgotfCAgIDxoZWFkPgotfCAgIDxib2R5PgotfCAgICAgPHA+Ci18ICAgICAgIDxkZD4KLUV4 cGVjdGVkOgotfCA8IURPQ1RZUEUgaHRtbD4KLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJv ZHk+Ci18ICAgICA8cD4KLXwgICAgIDxkZD4KLQotVGVzdCAyNyBvZiA1OSBpbiByZXNvdXJjZXMv dGVzdHMyLmRhdCBmYWlsZWQuIElucHV0OgotPCFkb2N0eXBlaHRtbD48cD48Zm9ybT4KLUdvdDoK LXwgPCFET0NUWVBFIGh0bWw+Ci18IDxodG1sPgotfCAgIDxoZWFkPgotfCAgIDxib2R5PgotfCAg ICAgPHA+Ci18ICAgICAgIDxmb3JtPgotRXhwZWN0ZWQ6Ci18IDwhRE9DVFlQRSBodG1sPgotfCA8 aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDxwPgotfCAgICAgPGZvcm0+Ci0K IFRlc3QgMzIgb2YgNTkgaW4gcmVzb3VyY2VzL3Rlc3RzMi5kYXQgZmFpbGVkLiBJbnB1dDoKIDwh RE9DVFlQRSBodG1sPlg8L2JvZHk+WAogR290OgpAQCAtMjA1MCw3ICsxODg4LDcgQEAgR290Ogog fCAgICAgICA8bGk+CiB8ICAgICAgICAgPGRpdj4KIHwgICAgICAgICAgIDxwPgotfCAgICAgICAg ICAgICA8bGk+Cit8ICAgICAgICAgICA8bGk+CiBFeHBlY3RlZDoKIHwgPCFET0NUWVBFIGh0bWw+ CiB8IDxodG1sPgpAQCAtMjE2Nyw3ICsyMDA1LDYgQEAgcmVzb3VyY2VzL3Rlc3RzNS5kYXQ6CiA3 CiA4CiA5Ci0xMQogCiBUZXN0IDIgb2YgMTYgaW4gcmVzb3VyY2VzL3Rlc3RzNS5kYXQgZmFpbGVk LiBJbnB1dDoKIDxzdHlsZT4gPCEtLSA8L3N0eWxlPiAtLT4gPC9zdHlsZT54CkBAIC0yMjYzLDIx ICsyMTAwLDYgQEAgRXhwZWN0ZWQ6CiB8ICAgICA8dGV4dGFyZWE+CiB8ICAgICAgICIgPCEtLS0g IgogfCAgICAgIi0+eCAtLT4geCIKLQotVGVzdCAxMSBvZiAxNiBpbiByZXNvdXJjZXMvdGVzdHM1 LmRhdCBmYWlsZWQuIElucHV0OgotPHA+PHhtcD48L3htcD4KLUdvdDoKLXwgPGh0bWw+Ci18ICAg PGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8cD4KLXwgICAgICAgPHhtcD4KLUV4cGVjdGVkOgot fCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDxwPgotfCAgICAgPHhtcD4K IHJlc291cmNlcy90ZXN0czYuZGF0OgogMQogOApAQCAtNTMzNiw5ICs1MTU4LDkgQEAgR290Ogog fCAgICAgICAgICAgICAgICAgImVnZ3MiCiB8ICAgICAgICAgICAgIDxnPgogfCAgICAgICAgICAg ICAgIDxmb3JlaWdub2JqZWN0PgotfCAgICAgICAgICAgICAgICAgPHA+Ci18ICAgICAgICAgICAg ICAgICAgICJzcGFtIgotfCAgICAgICAgICAgICAgICAgICA8dGFibGU+Cit8ICAgICA8cD4KK3wg ICAgICAgInNwYW0iCit8ICAgICAgIDx0YWJsZT4KIEV4cGVjdGVkOgogfCA8IURPQ1RZUEUgaHRt bD4KIHwgPGh0bWw+CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IDljYWU3MDk2ZjJiMWU2NzlhNDRhMjliNTk0ZDhjNjllNGZkNmJmN2UuLmUz NjBiNmE2YTczMzk3MTZjMjU3MDFlZmMwYjI0NzUzMTdkYTM0NzIgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjAgQEAKIAog ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBJbXBsZW1lbnQg cHJvY2Vzc0Zha2VQRW5kVGFnSWZQSW5TY29wZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDE1MDMKKworICAgICAgICBUaGlzIGlzIGEgY29tbW9uIGlk aW9tIGJlY2F1c2UgPHA+IGxpa2VzIHRvIGNsb3NlIGl0c2VsZi4KKworICAgICAgICAqIGh0bWwv SFRNTFRyZWVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6 cHJvY2Vzc0Zha2VQRW5kVGFnSWZQSW5TY29wZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJl ZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZyk6CisgICAgICAgICogaHRtbC9IVE1MVHJlZUJ1aWxk ZXIuaDoKKworMjAxMC0wNy0wMSAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCiAgICAgICAgIEhhbmRsZSA8YmFz ZT4gYW5kIGZyaWVuZHMgaW4gQWZ0ZXJIZWFkTW9kZQogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDE1MDIKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1s L0hUTUxUcmVlQnVpbGRlci5jcHAgYi9XZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcApp bmRleCBhYTI3MmVmOGI1NDc0MWVkMTI4NDk3MmU0NzBhYzcxZGM5Nzc1NmZkLi4wOGVlMTdjNWEz MTE3YzcxMDQwYzQ1MWFkMjE2OTc3NmE5YmEzYjVlIDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwv SFRNTFRyZWVCdWlsZGVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmNw cApAQCAtMzA4LDYgKzMwOCwxNCBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6aW5zZXJ0SFRNTFN0 YXJ0VGFnSW5Cb2R5KEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgbWVyZ2VBdHRyaWJ1dGVz RnJvbVRva2VuSW50b0VsZW1lbnQodG9rZW4sIG1fb3BlbkVsZW1lbnRzLmh0bWxFbGVtZW50KCkp OwogfQogCit2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0Zha2VQRW5kVGFnSWZQSW5TY29w ZSgpCit7CisgICAgaWYgKCFtX29wZW5FbGVtZW50cy5pblNjb3BlKHBUYWcubG9jYWxOYW1lKCkp KQorICAgICAgICByZXR1cm47CisgICAgQXRvbWljSFRNTFRva2VuIGVuZFAoSFRNTFRva2VuOjpF bmRUYWcsIHBUYWcubG9jYWxOYW1lKCkpOworICAgIHByb2Nlc3NFbmRUYWcoZW5kUCk7Cit9CisK IHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWcoQXRvbWljSFRNTFRva2VuJiB0 b2tlbikKIHsKICAgICBzd2l0Y2ggKGluc2VydGlvbk1vZGUoKSkgewpAQCAtMzk2LDE3ICs0MDQs MTggQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZyhBdG9taWNIVE1MVG9r ZW4mIHRva2VuKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIGlmICh0 b2tlbi5uYW1lKCkgPT0gYWRkcmVzc1RhZyB8fCB0b2tlbi5uYW1lKCkgPT0gYXJ0aWNsZVRhZyB8 fCB0b2tlbi5uYW1lKCkgPT0gYXNpZGVUYWcgfHwgdG9rZW4ubmFtZSgpID09IGJsb2NrcXVvdGVU YWcgfHwgdG9rZW4ubmFtZSgpID09IGNlbnRlclRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gImRldGFp bHMiIHx8IHRva2VuLm5hbWUoKSA9PSBkaXJUYWcgfHwgdG9rZW4ubmFtZSgpID09IGRpdlRhZyB8 fCB0b2tlbi5uYW1lKCkgPT0gZGxUYWcgfHwgdG9rZW4ubmFtZSgpID09IGZpZWxkc2V0VGFnIHx8 IHRva2VuLm5hbWUoKSA9PSAiZmlndXJlIiB8fCB0b2tlbi5uYW1lKCkgPT0gZm9vdGVyVGFnIHx8 IHRva2VuLm5hbWUoKSA9PSBoZWFkZXJUYWcgfHwgdG9rZW4ubmFtZSgpID09IGhncm91cFRhZyB8 fCB0b2tlbi5uYW1lKCkgPT0gbWVudVRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gbmF2VGFnIHx8IHRv a2VuLm5hbWUoKSA9PSBvbFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gcFRhZyB8fCB0b2tlbi5uYW1l KCkgPT0gc2VjdGlvblRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gdWxUYWcpIHsKLSAgICAgICAgICAg IG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgICAgICBwcm9jZXNzRmFrZVBFbmRUYWdJZlBJblNj b3BlKCk7CiAgICAgICAgICAgICBpbnNlcnRFbGVtZW50KHRva2VuKTsKICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgfQogICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IGgxVGFnIHx8IHRv a2VuLm5hbWUoKSA9PSBoMlRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gaDNUYWcgfHwgdG9rZW4ubmFt ZSgpID09IGg0VGFnIHx8IHRva2VuLm5hbWUoKSA9PSBoNVRhZyB8fCB0b2tlbi5uYW1lKCkgPT0g aDZUYWcpIHsKKyAgICAgICAgICAgIHByb2Nlc3NGYWtlUEVuZFRhZ0lmUEluU2NvcGUoKTsKICAg ICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7CiAgICAgICAgICAgICBpbnNlcnRFbGVtZW50KHRv a2VuKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgICAgICBpZiAodG9rZW4u bmFtZSgpID09IHByZVRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gbGlzdGluZ1RhZykgewotICAgICAg ICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAgIHByb2Nlc3NGYWtlUEVuZFRhZ0lm UEluU2NvcGUoKTsKICAgICAgICAgICAgIGluc2VydEVsZW1lbnQodG9rZW4pOwogICAgICAgICAg ICAgbV90b2tlbml6ZXItPnNraXBMZWFkaW5nTmV3TGluZUZvckxpc3RpbmcoKTsKICAgICAgICAg ICAgIG1fZnJhbWVzZXRPayA9IGZhbHNlOwpAQCAtNDE0LDIyICs0MjMsMjUgQEAgdm9pZCBIVE1M VHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZyhBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAg ICAgICB9CiAgICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gZm9ybVRhZykgewogICAgICAgICAg ICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAgIHByb2Nlc3NGYWtlUEVuZFRhZ0lmUElu U2NvcGUoKTsKICAgICAgICAgICAgIGluc2VydEVsZW1lbnQodG9rZW4pOwogICAgICAgICAgICAg bV9mb3JtRWxlbWVudCA9IGN1cnJlbnRFbGVtZW50KCk7CiAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgIH0KICAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBsaVRhZykgewogICAgICAgICAg ICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAgIHByb2Nlc3NGYWtlUEVuZFRhZ0lmUElu U2NvcGUoKTsKICAgICAgICAgICAgIGluc2VydEVsZW1lbnQodG9rZW4pOwogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gZGRUYWcgfHwg dG9rZW4ubmFtZSgpID09IGR0VGFnKSB7CiAgICAgICAgICAgICBub3RJbXBsZW1lbnRlZCgpOwor ICAgICAgICAgICAgcHJvY2Vzc0Zha2VQRW5kVGFnSWZQSW5TY29wZSgpOwogICAgICAgICAgICAg aW5zZXJ0RWxlbWVudCh0b2tlbik7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAg ICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBwbGFpbnRleHRUYWcpIHsKLSAgICAgICAgICAgIG5v dEltcGxlbWVudGVkKCk7CisgICAgICAgICAgICBwcm9jZXNzRmFrZVBFbmRUYWdJZlBJblNjb3Bl KCk7CiAgICAgICAgICAgICBpbnNlcnRFbGVtZW50KHRva2VuKTsKICAgICAgICAgICAgIG1fdG9r ZW5pemVyLT5zZXRTdGF0ZShIVE1MVG9rZW5pemVyOjpQTEFJTlRFWFRTdGF0ZSk7CiAgICAgICAg ICAgICByZXR1cm47CkBAIC00ODMsNyArNDk1LDcgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnBy b2Nlc3NTdGFydFRhZyhBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB9CiAgICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gaHJUYWcpIHsKLSAgICAg ICAgICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgICAgICBwcm9jZXNzRmFrZVBFbmRUYWdJ ZlBJblNjb3BlKCk7CiAgICAgICAgICAgICBpbnNlcnRTZWxmQ2xvc2luZ0VsZW1lbnQodG9rZW4p OwogICAgICAgICAgICAgbV9mcmFtZXNldE9rID0gZmFsc2U7CiAgICAgICAgICAgICByZXR1cm47 CkBAIC01MDksNyArNTIxLDcgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRh ZyhBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9 CiAgICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0geG1wVGFnKSB7Ci0gICAgICAgICAgICBub3RJ bXBsZW1lbnRlZCgpOworICAgICAgICAgICAgcHJvY2Vzc0Zha2VQRW5kVGFnSWZQSW5TY29wZSgp OwogICAgICAgICAgICAgcmVjb25zdHJ1Y3RUaGVBY3RpdmVGb3JtYXR0aW5nRWxlbWVudHMoKTsK ICAgICAgICAgICAgIG1fZnJhbWVzZXRPayA9IGZhbHNlOwogICAgICAgICAgICAgaW5zZXJ0R2Vu ZXJpY1Jhd1RleHRFbGVtZW50KHRva2VuKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1M VHJlZUJ1aWxkZXIuaCBiL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuaAppbmRleCAxYjRj Y2ZjZGVhNzQxNDViNmZkMDJmNWMzNTI0ZDQ5OTdiNjNkZmQ4Li5lODIzMDAxOTlhYjcwMzI0MGM1 ODlmNWRiN2MzMTNiZmEzMTY1MDZmIDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRNTFRyZWVC dWlsZGVyLmgKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5oCkBAIC0xMjIsOCAr MTIyLDggQEAgcHJpdmF0ZToKICAgICB2b2lkIHByb2Nlc3NEZWZhdWx0Rm9yQWZ0ZXJIZWFkTW9k ZShBdG9taWNIVE1MVG9rZW4mKTsKIAogICAgIGJvb2wgcHJvY2Vzc1N0YXJ0VGFnRm9ySW5IZWFk KEF0b21pY0hUTUxUb2tlbiYpOwotCiAgICAgYm9vbCBwcm9jZXNzQm9keUVuZFRhZ0ZvckluQm9k eShBdG9taWNIVE1MVG9rZW4mKTsKKyAgICB2b2lkIHByb2Nlc3NGYWtlUEVuZFRhZ0lmUEluU2Nv cGUoKTsKIAogICAgIHRlbXBsYXRlPHR5cGVuYW1lIENoaWxkVHlwZT4KICAgICBQYXNzUmVmUHRy PENoaWxkVHlwZT4gYXR0YWNoKE5vZGUqIHBhcmVudCwgUGFzc1JlZlB0cjxDaGlsZFR5cGU+IHBy cENoaWxkKQo=