41688 2010-07-06 05:36:31 -0700 Add processing for "in cell" mode and end tag processing for "in row" 2010-07-06 11:24:10 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 41123 1 eric eric abarth Ms2ger oldest_to_newest 247035 0 eric 2010-07-06 05:36:31 -0700 Add processing for "in cell" mode and end tag processing for "in row" 247037 1 60623 eric 2010-07-06 05:43:09 -0700 Created attachment 60623 Patch 247103 2 60623 abarth 2010-07-06 09:43:21 -0700 Comment on attachment 60623 Patch WebCore/html/HTMLTreeBuilder.cpp:760 + void HTMLTreeBuilder::closeTheCell() I like the insert-to-code ratio in this function. 247120 3 60623 abarth 2010-07-06 10:28:53 -0700 Comment on attachment 60623 Patch Clearing flags on attachment: 60623 Committed r62563: <http://trac.webkit.org/changeset/62563> 247121 4 abarth 2010-07-06 10:28:58 -0700 All reviewed patches have been landed. Closing bug. 247142 5 Ms2ger 2010-07-06 11:11:41 -0700 (In reply to comment #2) > (From update of attachment 60623 [details]) > WebCore/html/HTMLTreeBuilder.cpp:760 > + void HTMLTreeBuilder::closeTheCell() > I like the insert-to-code ratio in this function. And that's without asserting that insertionMode() == InRowMode after processFakeEndTag(tdTag). 247147 6 abarth 2010-07-06 11:24:10 -0700 > And that's without asserting that insertionMode() == InRowMode after processFakeEndTag(tdTag). Patches welcome. :) 60623 2010-07-06 05:43:09 -0700 2010-07-06 10:28:53 -0700 Patch bug-41688-20100706054308.patch text/plain 29856 eric ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwN2IzMzcyMWM3NDljOGUyOTg5Y2E3ZTgwMDc3ZGJiYTg3MzdlNGNhLi5mOWFlM2Q3 MDhjYmVmNjRjOTJiY2MwMjhmYjE1MWQ3MzA1ZmEyZWRiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMTcgQEAK IAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBBZGQgcHJv Y2Vzc2luZyBmb3IgImluIGNlbGwiIG1vZGUgYW5kIGVuZCB0YWcgcHJvY2Vzc2luZyBmb3IgImlu IHJvdyIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQx Njg4CisKKyAgICAgICAgKiBodG1sNWxpYi9yZXNvdXJjZXMvdGFibGVzMDEuZGF0OgorICAgICAg ICAqIGh0bWw1bGliL3J1bm5lci1leHBlY3RlZC1odG1sNS50eHQ6CisgICAgICAgICogaHRtbDVs aWIvcnVubmVyLWV4cGVjdGVkLnR4dDoKKworMjAxMC0wNy0wNiAgRXJpYyBTZWlkZWwgIDxlcmlj QHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAg ICAgICAgTWFrZSA8YT4gYXV0by1jbG9zZSBhbnkgcGFyZW50IDxhPiB0YWcKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxNjg0CiAKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2h0bWw1bGliL3Jlc291cmNlcy90YWJsZXMwMS5kYXQgYi9MYXlvdXRUZXN0 cy9odG1sNWxpYi9yZXNvdXJjZXMvdGFibGVzMDEuZGF0CmluZGV4IDVmODMwZjE5NGJmZDM3ZGY0 ZWQ5NmM3ODM2MGJjMjcyY2QwYWQ4ODIuLjkyNzVhZDMzM2I4NTc5MTExMDg5MzNkMDYyN2ZhMTU2 NzlkY2ZjZjAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0bWw1bGliL3Jlc291cmNlcy90YWJs ZXMwMS5kYXQKKysrIGIvTGF5b3V0VGVzdHMvaHRtbDVsaWIvcmVzb3VyY2VzL3RhYmxlczAxLmRh dApAQCAtMTE2LDMgKzExNiw1NSBAQAogfCAgICAgICAgIDx0cj4KIHwgICAgICAgICAgIDx0ZD4K IHwgICAgICAgICAgICAgIkIiCisKKyNkYXRhCis8dGFibGU+PHRkPjwvYm9keT48L2NhcHRpb24+ PC9jb2w+PC9jb2xncm91cD48L2h0bWw+Zm9vCisjZXJyb3JzCisjZG9jdW1lbnQKK3wgPGh0bWw+ Cit8ICAgPGhlYWQ+Cit8ICAgPGJvZHk+Cit8ICAgICA8dGFibGU+Cit8ICAgICAgIDx0Ym9keT4K K3wgICAgICAgICA8dHI+Cit8ICAgICAgICAgICA8dGQ+Cit8ICAgICAgICAgICAgICJmb28iCisK KyNkYXRhCis8dGFibGU+PHRkPkE8L3RhYmxlPkIKKyNlcnJvcnMKKyNkb2N1bWVudAorfCA8aHRt bD4KK3wgICA8aGVhZD4KK3wgICA8Ym9keT4KK3wgICAgIDx0YWJsZT4KK3wgICAgICAgPHRib2R5 PgorfCAgICAgICAgIDx0cj4KK3wgICAgICAgICAgIDx0ZD4KK3wgICAgICAgICAgICAgIkEiCit8 ICAgICAiQiIKKworI2RhdGEKKzx0YWJsZT48dHI+PGNhcHRpb24+CisjZXJyb3JzCisjZG9jdW1l bnQKK3wgPGh0bWw+Cit8ICAgPGhlYWQ+Cit8ICAgPGJvZHk+Cit8ICAgICA8dGFibGU+Cit8ICAg ICAgIDx0Ym9keT4KK3wgICAgICAgICA8dHI+Cit8ICAgICAgIDxjYXB0aW9uPgorCisjZGF0YQor PHRhYmxlPjx0cj48L2JvZHk+PC9jYXB0aW9uPjwvY29sPjwvY29sZ3JvdXA+PC9odG1sPjwvdGQ+ PC90aD48dGQ+Zm9vCisjZXJyb3JzCisjZG9jdW1lbnQKK3wgPGh0bWw+Cit8ICAgPGhlYWQ+Cit8 ICAgPGJvZHk+Cit8ICAgICA8dGFibGU+Cit8ICAgICAgIDx0Ym9keT4KK3wgICAgICAgICA8dHI+ Cit8ICAgICAgICAgICA8dGQ+Cit8ICAgICAgICAgICAgICJmb28iCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9odG1sNWxpYi9ydW5uZXItZXhwZWN0ZWQtaHRtbDUudHh0IGIvTGF5b3V0VGVzdHMv aHRtbDVsaWIvcnVubmVyLWV4cGVjdGVkLWh0bWw1LnR4dAppbmRleCBkMzUyMzY3MWExZWIxM2Vm ZDYwM2E4MzQzMTRlZTFkMDQ3YjcxNDllLi40Y2UzMGRlMDI5MzZkNmJlNDI4ZWYxNzY5OTZiYzk5 ZDI0MThjZjcxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odG1sNWxpYi9ydW5uZXItZXhwZWN0 ZWQtaHRtbDUudHh0CisrKyBiL0xheW91dFRlc3RzL2h0bWw1bGliL3J1bm5lci1leHBlY3RlZC1o dG1sNS50eHQKQEAgLTMsNyArMyw2IEBAIENPTlNPTEUgTUVTU0FHRTogbGluZSAyOiBQQVNTCiBD T05TT0xFIE1FU1NBR0U6IGxpbmUgMjogRk9PPHNwYW4+QkFSPC9zcGFuPkJBWgogQ29udGVudC1U eXBlOiB0ZXh0L3BsYWluCiByZXNvdXJjZXMvdGVzdHMxLmRhdDoKLTIwCiAyMQogMzAKIDMyCkBA IC0xNSw4ICsxNCw2IEBAIHJlc291cmNlcy90ZXN0czEuZGF0OgogODAKIDg2CiA5MAotOTMKLTk0 CiAxMDMKIDEwNAogMTA3CkBAIC0yNCwyOCArMjEsNiBAQCByZXNvdXJjZXMvdGVzdHMxLmRhdDoK IDExMAogMTEyCiAKLVRlc3QgMjAgb2YgMTEzIGluIHJlc291cmNlcy90ZXN0czEuZGF0IGZhaWxl ZC4gSW5wdXQ6Ci08Yj48dGFibGU+PHRkPjxpPjwvdGFibGU+Ci1Hb3Q6Ci18IDxodG1sPgotfCAg IDxoZWFkPgotfCAgIDxib2R5PgotfCAgICAgPGI+Ci18ICAgICAgIDx0YWJsZT4KLXwgICAgICAg ICA8dGJvZHk+Ci18ICAgICAgICAgICA8dHI+Ci18ICAgICAgICAgICAgIDx0ZD4KLUV4cGVjdGVk OgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDxiPgotfCAgICAgICA8 dGFibGU+Ci18ICAgICAgICAgPHRib2R5PgotfCAgICAgICAgICAgPHRyPgotfCAgICAgICAgICAg ICA8dGQ+Ci18ICAgICAgICAgICAgICAgPGk+Ci0KIFRlc3QgMjEgb2YgMTEzIGluIHJlc291cmNl cy90ZXN0czEuZGF0IGZhaWxlZC4gSW5wdXQ6CiA8Yj48dGFibGU+PHRkPjwvYj48aT48L3RhYmxl PlgKIEdvdDoKQEAgLTU3LDYgKzMyLDcgQEAgR290OgogfCAgICAgICAgIDx0Ym9keT4KIHwgICAg ICAgICAgIDx0cj4KIHwgICAgICAgICAgICAgPHRkPgorfCAgICAgICAgICAgICAgIDxpPgogRXhw ZWN0ZWQ6CiB8IDxodG1sPgogfCAgIDxoZWFkPgpAQCAtODAsNiArNTYsOSBAQCBHb3Q6CiB8ICAg ICAgICAgPHRib2R5PgogfCAgICAgICAgICAgPHRyPgogfCAgICAgICAgICAgICA8dGQ+Cit8ICAg ICAgICAgICAgICAgPGE+Cit8ICAgICAgICAgICAgICAgICA8dGFibGU+Cit8ICAgICAgICAgICAg ICAgPGE+CiBFeHBlY3RlZDoKIHwgPGh0bWw+CiB8ICAgPGhlYWQ+CkBAIC0xMTcsNyArOTYsOSBA QCBHb3Q6CiB8ICAgICAgICAgICA8dGJvZHk+CiB8ICAgICAgICAgICAgIDx0cj4KIHwgICAgICAg ICAgICAgICA8dGg+Ci18ICAgICAgICAgICAgICAgICA8IS0tIFggLS0+Cit8ICAgICAgICAgICAg ICAgICA8aT4KK3wgICAgICAgICAgICAgICAgICAgInBsZWFzZSEiCit8ICAgICAgICAgICAgIDwh LS0gWCAtLT4KIEV4cGVjdGVkOgogfCA8IS0tIC0gLS0+CiB8IDxodG1sPgpAQCAtMjY1LDYgKzI0 Niw5IEBAIEdvdDoKIHwgICAgICAgICA8dGJvZHk+CiB8ICAgICAgICAgICA8dHI+CiB8ICAgICAg ICAgICAgIDx0ZD4KK3wgICAgICAgICAgICAgICA8YT4KK3wgICAgICAgICAgICAgICAgIGhyZWY9 ImZvbyIKK3wgICAgICAgICAgICAgICAgICJiciIKIEV4cGVjdGVkOgogfCA8aHRtbD4KIHwgICA8 aGVhZD4KQEAgLTI5NCw2ICsyNzgsOSBAQCBHb3Q6CiB8ICAgICAgIDx0Ym9keT4KIHwgICAgICAg ICA8dHI+CiB8ICAgICAgICAgICA8dGQ+Cit8ICAgICAgICAgICAgIDxhPgorfCAgICAgICAgICAg ICAgIGhyZWY9ImZvbyIKK3wgICAgICAgICAgICAgICAiYnIiCiBFeHBlY3RlZDoKIHwgPGh0bWw+ CiB8ICAgPGhlYWQ+CkBAIC0zMjUsNiArMzEyLDkgQEAgR290OgogfCAgICAgICA8dGJvZHk+CiB8 ICAgICAgICAgPHRyPgogfCAgICAgICAgICAgPHRkPgorfCAgICAgICAgICAgICA8c3Bhbj4KK3wg ICAgICAgICAgICAgICA8c3Bhbj4KK3wgICAgICAgICAgICAgICAgICJYIgogRXhwZWN0ZWQ6CiB8 IDxodG1sPgogfCAgIDxoZWFkPgpAQCAtMzY1LDUwICszNTUsNiBAQCBFeHBlY3RlZDoKIHwgICAg IDxkaXY+CiB8ICAgICAgIDxhPgogCi1UZXN0IDkzIG9mIDExMyBpbiByZXNvdXJjZXMvdGVzdHMx LmRhdCBmYWlsZWQuIElucHV0OgotPGI+PHRhYmxlPjx0ZD48aT48L3RhYmxlPgotR290OgotfCA8 aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDxiPgotfCAgICAgICA8dGFibGU+ Ci18ICAgICAgICAgPHRib2R5PgotfCAgICAgICAgICAgPHRyPgotfCAgICAgICAgICAgICA8dGQ+ Ci1FeHBlY3RlZDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8Yj4K LXwgICAgICAgPHRhYmxlPgotfCAgICAgICAgIDx0Ym9keT4KLXwgICAgICAgICAgIDx0cj4KLXwg ICAgICAgICAgICAgPHRkPgotfCAgICAgICAgICAgICAgIDxpPgotCi1UZXN0IDk0IG9mIDExMyBp biByZXNvdXJjZXMvdGVzdHMxLmRhdCBmYWlsZWQuIElucHV0OgotPGI+PHRhYmxlPjx0ZD48L2I+ PGk+PC90YWJsZT4KLUdvdDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAg ICA8Yj4KLXwgICAgICAgPHRhYmxlPgotfCAgICAgICAgIDx0Ym9keT4KLXwgICAgICAgICAgIDx0 cj4KLXwgICAgICAgICAgICAgPHRkPgotRXhwZWN0ZWQ6Ci18IDxodG1sPgotfCAgIDxoZWFkPgot fCAgIDxib2R5PgotfCAgICAgPGI+Ci18ICAgICAgIDx0YWJsZT4KLXwgICAgICAgICA8dGJvZHk+ Ci18ICAgICAgICAgICA8dHI+Ci18ICAgICAgICAgICAgIDx0ZD4KLXwgICAgICAgICAgICAgICA8 aT4KLQogVGVzdCAxMDMgb2YgMTEzIGluIHJlc291cmNlcy90ZXN0czEuZGF0IGZhaWxlZC4gSW5w dXQ6CiA8YT48dGFibGU+PHRkPjxhPjx0YWJsZT48L3RhYmxlPjxhPjwvdHI+PGE+PC90YWJsZT48 YT4KIEdvdDoKQEAgLTQyMCw2ICszNjYsOSBAQCBHb3Q6CiB8ICAgICAgICAgPHRib2R5PgogfCAg ICAgICAgICAgPHRyPgogfCAgICAgICAgICAgICA8dGQ+Cit8ICAgICAgICAgICAgICAgPGE+Cit8 ICAgICAgICAgICAgICAgICA8dGFibGU+Cit8ICAgICAgICAgICAgICAgPGE+CiBFeHBlY3RlZDoK IHwgPGh0bWw+CiB8ICAgPGhlYWQ+CkBAIC00ODMsNiArNDMyLDcgQEAgR290OgogfCAgICAgICAg IDx0Ym9keT4KIHwgICAgICAgICAgIDx0cj4KIHwgICAgICAgICAgICAgPHRkPgorfCAgICAgICAg ICAgICAgIDxoMz4KIEV4cGVjdGVkOgogfCA8aHRtbD4KIHwgICA8aGVhZD4KQEAgLTUwNiw2ICs0 NTYsNyBAQCBHb3Q6CiB8ICAgICAgICAgPGNvbD4KIHwgICAgICAgPHRib2R5PgogfCAgICAgICAg IDx0cj4KK3wgICAgICAgICA8dHI+CiB8ICAgICAgICAgICA8dGQ+CiBFeHBlY3RlZDoKIHwgPGh0 bWw+CkBAIC01MzcsNiArNDg4LDcgQEAgR290OgogfCAgICAgICA8Y29sZ3JvdXA+CiB8ICAgICAg IDx0Ym9keT4KIHwgICAgICAgICA8dHI+Cit8ICAgICAgICAgPHRyPgogfCAgICAgICAgICAgPHRk PgogRXhwZWN0ZWQ6CiB8IDxodG1sPgpAQCAtNTczLDM2ICs1MjUsMTMgQEAgRXhwZWN0ZWQ6CiB8 ICAgICAgICAgPHRyPgogfCAgICAgPHA+CiByZXNvdXJjZXMvdGVzdHMyLmRhdDoKLTQKIDkKIDEx CiAxMwotMzQKIDM2CiA0NwogNDgKIDQ5Ci01OAotCi1UZXN0IDQgb2YgNTkgaW4gcmVzb3VyY2Vz L3Rlc3RzMi5kYXQgZmFpbGVkLiBJbnB1dDoKLTx0YWJsZT48dGQ+dGVzdDwvdGJvZHk+PC90YWJs ZT4KLUdvdDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8dGFibGU+ Ci18ICAgICAgIDx0Ym9keT4KLXwgICAgICAgICA8dHI+Ci18ICAgICAgICAgICA8dGQ+Ci1FeHBl Y3RlZDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8dGFibGU+Ci18 ICAgICAgIDx0Ym9keT4KLXwgICAgICAgICA8dHI+Ci18ICAgICAgICAgICA8dGQ+Ci18ICAgICAg ICAgICAgICJ0ZXN0IgogCiBUZXN0IDkgb2YgNTkgaW4gcmVzb3VyY2VzL3Rlc3RzMi5kYXQgZmFp bGVkLiBJbnB1dDoKIDwhRE9DVFlQRSBodG1sPjxkdD48ZGl2PjxkZD4KQEAgLTY1MCw2ICs1Nzks NyBAQCBHb3Q6CiB8ICAgICA8dGFibGU+CiB8ICAgICAgIDx0Ym9keT4KIHwgICAgICAgICA8dHI+ Cit8ICAgICAgICAgICAiVEVTVCIKIEV4cGVjdGVkOgogfCA8IURPQ1RZUEUgaHRtbD4KIHwgPGh0 bWw+CkBAIC02NjAsMzIgKzU5MCw2IEBAIEV4cGVjdGVkOgogfCAgICAgICA8dGJvZHk+CiB8ICAg ICAgICAgPHRyPgogCi1UZXN0IDM0IG9mIDU5IGluIHJlc291cmNlcy90ZXN0czIuZGF0IGZhaWxl ZC4gSW5wdXQ6Ci08IURPQ1RZUEUgaHRtbD48dGFibGU+PGNhcHRpb24+dGVzdCBURVNUPC9jYXB0 aW9uPjx0ZD50ZXN0Ci1Hb3Q6Ci18IDwhRE9DVFlQRSBodG1sPgotfCA8aHRtbD4KLXwgICA8aGVh ZD4KLXwgICA8Ym9keT4KLXwgICAgIDx0YWJsZT4KLXwgICAgICAgPGNhcHRpb24+Ci18ICAgICAg ICAgInRlc3QgVEVTVCIKLXwgICAgICAgPHRib2R5PgotfCAgICAgICAgIDx0cj4KLXwgICAgICAg ICAgIDx0ZD4KLUV4cGVjdGVkOgotfCA8IURPQ1RZUEUgaHRtbD4KLXwgPGh0bWw+Ci18ICAgPGhl YWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8dGFibGU+Ci18ICAgICAgIDxjYXB0aW9uPgotfCAgICAg ICAgICJ0ZXN0IFRFU1QiCi18ICAgICAgIDx0Ym9keT4KLXwgICAgICAgICA8dHI+Ci18ICAgICAg ICAgICA8dGQ+Ci18ICAgICAgICAgICAgICJ0ZXN0IgotCiBUZXN0IDM2IG9mIDU5IGluIHJlc291 cmNlcy90ZXN0czIuZGF0IGZhaWxlZC4gSW5wdXQ6CiA8IURPQ1RZUEUgaHRtbD48c2VsZWN0Pjxv cHRncm91cD48b3B0aW9uPjwvb3B0Z3JvdXA+PG9wdGlvbj48c2VsZWN0PjxvcHRpb24+CiBHb3Q6 CkBAIC03NjQsMjggKzY2OCw2IEBAIEV4cGVjdGVkOgogfCAgICAgICAieCIKIHwgICAgICIgICIK IHwgICA8Ym9keT4KLQotVGVzdCA1OCBvZiA1OSBpbiByZXNvdXJjZXMvdGVzdHMyLmRhdCBmYWls ZWQuIElucHV0OgotPCFET0NUWVBFIGh0bWw+PHRhYmxlPjx0cj48dGQ+PC9wPjwvdGFibGU+Ci1H b3Q6Ci18IDwhRE9DVFlQRSBodG1sPgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4K LXwgICAgIDx0YWJsZT4KLXwgICAgICAgPHRib2R5PgotfCAgICAgICAgIDx0cj4KLXwgICAgICAg ICAgIDx0ZD4KLUV4cGVjdGVkOgotfCA8IURPQ1RZUEUgaHRtbD4KLXwgPGh0bWw+Ci18ICAgPGhl YWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8dGFibGU+Ci18ICAgICAgIDx0Ym9keT4KLXwgICAgICAg ICA8dHI+Ci18ICAgICAgICAgICA8dGQ+Ci18ICAgICAgICAgICAgIDxwPgogcmVzb3VyY2VzL3Rl c3RzMy5kYXQ6CiAxNgogMTcKQEAgLTEzMTUsNyArMTE5Nyw2IEBAIHJlc291cmNlcy90ZXN0czcu ZGF0OgogMTkKIDIwCiAyNAotMjYKIDI3CiAyOAogMjkKQEAgLTEzNjksNiArMTI1MCw5IEBAIEdv dDoKIHwgICAgICAgPHRib2R5PgogfCAgICAgICAgIDx0cj4KIHwgICAgICAgICAgIDx0ZD4KK3wg ICAgICAgICAgICAgPHRhYmxlPgorfCAgICAgICAgICAgICAgICIgIgorfCAgICAgICAgICAgICAg IDxtZXRhPgogRXhwZWN0ZWQ6CiB8IDwhRE9DVFlQRSBodG1sPgogfCA8aHRtbD4KQEAgLTE0MjEs NiArMTMwNSw3IEBAIEdvdDoKIHwgICAgIDx0YWJsZT4KIHwgICAgICAgPHRib2R5PgogfCAgICAg ICAgIDx0cj4KK3wgICAgICAgICAgICJ4ICAiCiBFeHBlY3RlZDoKIHwgPCFET0NUWVBFIGh0bWw+ CiB8IDxodG1sPgpAQCAtMTU1NywyNyArMTQ0Miw2IEBAIEV4cGVjdGVkOgogfCA8Ym9keT4KIHwg ICAiWCIKIAotVGVzdCAyNiBvZiAzMCBpbiByZXNvdXJjZXMvdGVzdHM3LmRhdCBmYWlsZWQuIElu cHV0OgotPHRhYmxlPjx0cj48dGQ+PGNvZGU+PC9jb2RlPiA8L3RhYmxlPgotR290OgotfCA8aHRt bD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDx0YWJsZT4KLXwgICAgICAgPHRib2R5 PgotfCAgICAgICAgIDx0cj4KLXwgICAgICAgICAgIDx0ZD4KLUV4cGVjdGVkOgotfCA8aHRtbD4K LXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDx0YWJsZT4KLXwgICAgICAgPHRib2R5Pgot fCAgICAgICAgIDx0cj4KLXwgICAgICAgICAgIDx0ZD4KLXwgICAgICAgICAgICAgPGNvZGU+Ci18 ICAgICAgICAgICAgICIgIgotCiBUZXN0IDI3IG9mIDMwIGluIHJlc291cmNlcy90ZXN0czcuZGF0 IGZhaWxlZC4gSW5wdXQ6CiA8dGFibGU+PGI+PHRyPjx0ZD5hYWE8L3RkPjwvdHI+YmJiPC90YWJs ZT5jY2MKIEdvdDoKQEAgLTE1ODksNiArMTQ1Myw3IEBAIEdvdDoKIHwgICAgICAgPHRib2R5Pgog fCAgICAgICAgIDx0cj4KIHwgICAgICAgICAgIDx0ZD4KK3wgICAgICAgICAgICAgImFhYSIKIEV4 cGVjdGVkOgogfCA8aHRtbD4KIHwgICA8aGVhZD4KQEAgLTE2MTQsNiArMTQ3OSw3IEBAIEdvdDoK IHwgICAgIDx0YWJsZT4KIHwgICAgICAgPHRib2R5PgogfCAgICAgICAgIDx0cj4KK3wgICAgICAg ICAgICIgQiIKIEV4cGVjdGVkOgogfCA8aHRtbD4KIHwgICA8aGVhZD4KQEAgLTE2MzMsNiArMTQ5 OSw3IEBAIEdvdDoKIHwgICAgIDx0YWJsZT4KIHwgICAgICAgPHRib2R5PgogfCAgICAgICAgIDx0 cj4KK3wgICAgICAgICAgICIgQiIKIEV4cGVjdGVkOgogfCA8aHRtbD4KIHwgICA8aGVhZD4KQEAg LTE5NTksNiArMTgyNiw3IEBAIEdvdDoKIHwgICAgIDx0YWJsZT4KIHwgICAgICAgPHRib2R5Pgog fCAgICAgICAgIDx0cj4KK3wgICAgICAgICAgICJmb29iYXIiCiBFeHBlY3RlZDoKIHwgPCFET0NU WVBFIGh0bWw+CiB8IDxodG1sPgpAQCAtMTk4NCw2ICsxODUyLDExIEBAIEdvdDoKIHwgICAgICAg PHRib2R5PgogfCAgICAgICAgIDx0cj4KIHwgICAgICAgICAgIDx0ZD4KK3wgICAgICAgICAgICAg PG1hdGg+Cit8ICAgICAgICAgICAgICAgPG1pPgorfCAgICAgICAgICAgICAgICAgImZvbyIKK3wg ICAgICAgICAgICAgICA8bWk+Cit8ICAgICAgICAgICAgICAgICAiYmFyIgogRXhwZWN0ZWQ6CiB8 IDwhRE9DVFlQRSBodG1sPgogfCA8aHRtbD4KQEAgLTIwMTAsNiArMTg4MywxMyBAQCBHb3Q6CiB8 ICAgICAgIDx0Ym9keT4KIHwgICAgICAgICA8dHI+CiB8ICAgICAgICAgICA8dGQ+Cit8ICAgICAg ICAgICAgIDxtYXRoPgorfCAgICAgICAgICAgICAgIDxtaT4KK3wgICAgICAgICAgICAgICAgICJm b28iCit8ICAgICAgICAgICAgICAgPG1pPgorfCAgICAgICAgICAgICAgICAgImJhciIKK3wgICAg ICAgICAgICAgPHA+Cit8ICAgICAgICAgICAgICAgImJheiIKIEV4cGVjdGVkOgogfCA8IURPQ1RZ UEUgaHRtbD4KIHwgPGh0bWw+CkBAIC0yMTcyLDYgKzIwNTIsOCBAQCBHb3Q6CiB8ICAgICAgIDx0 Ym9keT4KIHwgICAgICAgICA8dHI+CiB8ICAgICAgICAgICA8dGQ+Cit8ICAgICAgICAgICAgIDxz ZWxlY3Q+Cit8ICAgICAgICAgICAgICAgImZvb2JhcmJheiIKIEV4cGVjdGVkOgogfCA8IURPQ1RZ UEUgaHRtbD4KIHwgPGh0bWw+CkBAIC0yNTA2LDYgKzIzODgsNyBAQCBHb3Q6CiB8ICAgICA8dGFi bGU+CiB8ICAgICAgIDx0Ym9keT4KIHwgICAgICAgICA8dHI+Cit8ICAgICAgICAgICAiZm9vYmFy IgogRXhwZWN0ZWQ6CiB8IDwhRE9DVFlQRSBodG1sPgogfCA8aHRtbD4KQEAgLTI1MzEsNiArMjQx NCwxMSBAQCBHb3Q6CiB8ICAgICAgIDx0Ym9keT4KIHwgICAgICAgICA8dHI+CiB8ICAgICAgICAg ICA8dGQ+Cit8ICAgICAgICAgICAgIDxzdmc+Cit8ICAgICAgICAgICAgICAgPGc+Cit8ICAgICAg ICAgICAgICAgICAiZm9vIgorfCAgICAgICAgICAgICAgIDxnPgorfCAgICAgICAgICAgICAgICAg ImJhciIKIEV4cGVjdGVkOgogfCA8IURPQ1RZUEUgaHRtbD4KIHwgPGh0bWw+CkBAIC0yNTU3LDYg KzI0NDUsMTMgQEAgR290OgogfCAgICAgICA8dGJvZHk+CiB8ICAgICAgICAgPHRyPgogfCAgICAg ICAgICAgPHRkPgorfCAgICAgICAgICAgICA8c3ZnPgorfCAgICAgICAgICAgICAgIDxnPgorfCAg ICAgICAgICAgICAgICAgImZvbyIKK3wgICAgICAgICAgICAgICA8Zz4KK3wgICAgICAgICAgICAg ICAgICJiYXIiCit8ICAgICAgICAgICAgIDxwPgorfCAgICAgICAgICAgICAgICJiYXoiCiBFeHBl Y3RlZDoKIHwgPCFET0NUWVBFIGh0bWw+CiB8IDxodG1sPgpAQCAtMjcxOSw2ICsyNjE0LDggQEAg R290OgogfCAgICAgICA8dGJvZHk+CiB8ICAgICAgICAgPHRyPgogfCAgICAgICAgICAgPHRkPgor fCAgICAgICAgICAgICA8c2VsZWN0PgorfCAgICAgICAgICAgICAgICJmb29iYXJiYXoiCiBFeHBl Y3RlZDoKIHwgPCFET0NUWVBFIGh0bWw+CiB8IDxodG1sPgpAQCAtMzg2Niw2ICszNzYzLDcgQEAg R290OgogfCAgICAgICAgIDx0Ym9keT4KIHwgICAgICAgICAgIDx0cj4KIHwgICAgICAgICAgICAg PHRkPgorfCAgICAgICAgICAgICAgIDxpbWc+CiBFeHBlY3RlZDoKIHwgPCFET0NUWVBFIGh0bWw+ CiB8IDxodG1sPgpAQCAtMzkyMCw2ICszODE4LDcgQEAgR290OgogfCAgICAgICAgICAgICAgICAg ICA8dGJvZHk+CiB8ICAgICAgICAgICAgICAgICAgICAgPHRyPgogfCAgICAgICAgICAgICAgICAg ICAgICAgPHRkPgorfCAgICAgICAgICAgICAgICAgICAgICAgICA8aW1nPgogRXhwZWN0ZWQ6CiB8 IDwhRE9DVFlQRSBodG1sPgogfCA8aHRtbD4KQEAgLTQwOTcsNiArMzk5Niw3IEBAIEdvdDoKIHwg ICAgIDx0YWJsZT4KIHwgICAgICAgPHRib2R5PgogfCAgICAgICAgIDx0cj4KK3wgICAgICAgICAg ICIgeCIKIEV4cGVjdGVkOgogfCA8IURPQ1RZUEUgaHRtbD4KIHwgPGh0bWw+CkBAIC00MTQ1LDYg KzQwNDUsOCBAQCBHb3Q6CiB8ICAgICAgICAgPHRib2R5PgogfCAgICAgICAgICAgPHRyPgogfCAg ICAgICAgICAgICA8dGQ+Cit8ICAgICAgICAgICAgICAgImJhciIKK3wgICAgICAgICAgICAgIiAi CiBFeHBlY3RlZDoKIHwgPCFET0NUWVBFIGh0bWw+CiB8IDxodG1sPgpAQCAtNDE2MCwzMyArNDA2 Miw4IEBAIEV4cGVjdGVkOgogfCAgICAgICAgICAgICA8dGQ+CiB8ICAgICAgICAgICAgICAgImJh ciIKIHwgICAgICAgICAgICAgIiAiCi1yZXNvdXJjZXMvdGVzdHMxNi5kYXQ6Ci0xODgKK3Jlc291 cmNlcy90ZXN0czE2LmRhdDogUEFTUwogCi1UZXN0IDE4OCBvZiAxODkgaW4gcmVzb3VyY2VzL3Rl c3RzMTYuZGF0IGZhaWxlZC4gSW5wdXQ6Ci08IWRvY3R5cGUgaHRtbD48dGFibGU+PHRkPjxzcGFu Pjxmb250Pjwvc3Bhbj48c3Bhbj4KLUdvdDoKLXwgPCFET0NUWVBFIGh0bWw+Ci18IDxodG1sPgot fCAgIDxoZWFkPgotfCAgIDxib2R5PgotfCAgICAgPHRhYmxlPgotfCAgICAgICA8dGJvZHk+Ci18 ICAgICAgICAgPHRyPgotfCAgICAgICAgICAgPHRkPgotRXhwZWN0ZWQ6Ci18IDwhRE9DVFlQRSBo dG1sPgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDx0YWJsZT4KLXwg ICAgICAgPHRib2R5PgotfCAgICAgICAgIDx0cj4KLXwgICAgICAgICAgIDx0ZD4KLXwgICAgICAg ICAgICAgPHNwYW4+Ci18ICAgICAgICAgICAgICAgPGZvbnQ+Ci18ICAgICAgICAgICAgIDxmb250 PgotfCAgICAgICAgICAgICAgIDxzcGFuPgogcmVzb3VyY2VzL3dlYmtpdDAxLmRhdDogUEFTUwog CiByZXNvdXJjZXMvZG9jdHlwZTAxLmRhdDogUEFTUwpAQCAtNDMzOSw4ICs0MjE2LDEwIEBAIHJl c291cmNlcy90YWJsZXMwMS5kYXQ6CiA4CiA5CiAxMAorMTIKKzEzCiAKLVRlc3QgNCBvZiAxMCBp biByZXNvdXJjZXMvdGFibGVzMDEuZGF0IGZhaWxlZC4gSW5wdXQ6CitUZXN0IDQgb2YgMTQgaW4g cmVzb3VyY2VzL3RhYmxlczAxLmRhdCBmYWlsZWQuIElucHV0OgogPHRhYmxlPjxjb2xncm91cD48 L2h0bWw+Zm9vCiBHb3Q6CiB8IDxodG1sPgpAQCAtNDM1Nyw3ICs0MjM2LDcgQEAgRXhwZWN0ZWQ6 CiB8ICAgICA8dGFibGU+CiB8ICAgICAgIDxjb2xncm91cD4KIAotVGVzdCA3IG9mIDEwIGluIHJl c291cmNlcy90YWJsZXMwMS5kYXQgZmFpbGVkLiBJbnB1dDoKK1Rlc3QgNyBvZiAxNCBpbiByZXNv dXJjZXMvdGFibGVzMDEuZGF0IGZhaWxlZC4gSW5wdXQ6CiA8dGFibGU+PHNlbGVjdD48b3B0aW9u PjM8L3NlbGVjdD48L3RhYmxlPgogR290OgogfCA8aHRtbD4KQEAgLTQzNzYsNyArNDI1NSw3IEBA IEV4cGVjdGVkOgogfCAgICAgICAgICIzIgogfCAgICAgPHRhYmxlPgogCi1UZXN0IDggb2YgMTAg aW4gcmVzb3VyY2VzL3RhYmxlczAxLmRhdCBmYWlsZWQuIElucHV0OgorVGVzdCA4IG9mIDE0IGlu IHJlc291cmNlcy90YWJsZXMwMS5kYXQgZmFpbGVkLiBJbnB1dDoKIDx0YWJsZT48c2VsZWN0Pjx0 YWJsZT48L3RhYmxlPjwvc2VsZWN0PjwvdGFibGU+CiBHb3Q6CiB8IDxodG1sPgpAQCAtNDM5Miw3 ICs0MjcxLDcgQEAgRXhwZWN0ZWQ6CiB8ICAgICA8dGFibGU+CiB8ICAgICA8dGFibGU+CiAKLVRl c3QgOSBvZiAxMCBpbiByZXNvdXJjZXMvdGFibGVzMDEuZGF0IGZhaWxlZC4gSW5wdXQ6CitUZXN0 IDkgb2YgMTQgaW4gcmVzb3VyY2VzL3RhYmxlczAxLmRhdCBmYWlsZWQuIElucHV0OgogPHRhYmxl PjxzZWxlY3Q+PC90YWJsZT4KIEdvdDoKIHwgPGh0bWw+CkBAIC00NDA3LDcgKzQyODYsNyBAQCBF eHBlY3RlZDoKIHwgICAgIDxzZWxlY3Q+CiB8ICAgICA8dGFibGU+CiAKLVRlc3QgMTAgb2YgMTAg aW4gcmVzb3VyY2VzL3RhYmxlczAxLmRhdCBmYWlsZWQuIElucHV0OgorVGVzdCAxMCBvZiAxNCBp biByZXNvdXJjZXMvdGFibGVzMDEuZGF0IGZhaWxlZC4gSW5wdXQ6CiA8dGFibGU+PHNlbGVjdD48 b3B0aW9uPkE8dHI+PHRkPkI8L3RkPjwvdHI+PC90YWJsZT4KIEdvdDoKIHwgPGh0bWw+CkBAIC00 NDIwLDYgKzQyOTksNyBAQCBHb3Q6CiB8ICAgICAgIDx0Ym9keT4KIHwgICAgICAgICA8dHI+CiB8 ICAgICAgICAgICA8dGQ+Cit8ICAgICAgICAgICAgICJCIgogRXhwZWN0ZWQ6CiB8IDxodG1sPgog fCAgIDxoZWFkPgpAQCAtNDQzMiw0ICs0MzEyLDQ0IEBAIEV4cGVjdGVkOgogfCAgICAgICAgIDx0 cj4KIHwgICAgICAgICAgIDx0ZD4KIHwgICAgICAgICAgICAgIkIiCisKK1Rlc3QgMTIgb2YgMTQg aW4gcmVzb3VyY2VzL3RhYmxlczAxLmRhdCBmYWlsZWQuIElucHV0OgorPHRhYmxlPjx0ZD5BPC90 YWJsZT5CCitHb3Q6Cit8IDxodG1sPgorfCAgIDxoZWFkPgorfCAgIDxib2R5PgorfCAgICAgPHRh YmxlPgorfCAgICAgICA8dGJvZHk+Cit8ICAgICAgICAgPHRyPgorfCAgICAgICAgICAgPHRkPgor fCAgICAgICAgICAgICAiQSIKK0V4cGVjdGVkOgorfCA8aHRtbD4KK3wgICA8aGVhZD4KK3wgICA8 Ym9keT4KK3wgICAgIDx0YWJsZT4KK3wgICAgICAgPHRib2R5PgorfCAgICAgICAgIDx0cj4KK3wg ICAgICAgICAgIDx0ZD4KK3wgICAgICAgICAgICAgIkEiCit8ICAgICAiQiIKKworVGVzdCAxMyBv ZiAxNCBpbiByZXNvdXJjZXMvdGFibGVzMDEuZGF0IGZhaWxlZC4gSW5wdXQ6Cis8dGFibGU+PHRy PjxjYXB0aW9uPgorR290OgorfCA8aHRtbD4KK3wgICA8aGVhZD4KK3wgICA8Ym9keT4KK3wgICAg IDx0YWJsZT4KK3wgICAgICAgPHRib2R5PgorfCAgICAgICAgIDx0cj4KK0V4cGVjdGVkOgorfCA8 aHRtbD4KK3wgICA8aGVhZD4KK3wgICA8Ym9keT4KK3wgICAgIDx0YWJsZT4KK3wgICAgICAgPHRi b2R5PgorfCAgICAgICAgIDx0cj4KK3wgICAgICAgPGNhcHRpb24+CiAjRU9GCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9odG1sNWxpYi9ydW5uZXItZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv aHRtbDVsaWIvcnVubmVyLWV4cGVjdGVkLnR4dAppbmRleCBmNTk5MzFlYTU0MWVlMTdkYTJlMWZh MzEzMjQwYTk3MzY5YTU2Zjk2Li4yNzgwOTI3N2IzMjMzYzQ2OGQ3NDRiYTg1NTNjZTE4MGI4Mjg3 MGJkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odG1sNWxpYi9ydW5uZXItZXhwZWN0ZWQudHh0 CisrKyBiL0xheW91dFRlc3RzL2h0bWw1bGliL3J1bm5lci1leHBlY3RlZC50eHQKQEAgLTUxMzUs NyArNTEzNSw3IEBAIHJlc291cmNlcy90YWJsZXMwMS5kYXQ6CiA4CiA5CiAKLVRlc3QgMyBvZiAx MCBpbiByZXNvdXJjZXMvdGFibGVzMDEuZGF0IGZhaWxlZC4gSW5wdXQ6CitUZXN0IDMgb2YgMTQg aW4gcmVzb3VyY2VzL3RhYmxlczAxLmRhdCBmYWlsZWQuIElucHV0OgogPHRhYmxlPjxjb2wgZm9v PSdiYXInPgogR290OgogfCA8aHRtbD4KQEAgLTUxNTMsNyArNTE1Myw3IEBAIEV4cGVjdGVkOgog fCAgICAgICAgIDxjb2w+CiB8ICAgICAgICAgICBmb289ImJhciIKIAotVGVzdCA3IG9mIDEwIGlu IHJlc291cmNlcy90YWJsZXMwMS5kYXQgZmFpbGVkLiBJbnB1dDoKK1Rlc3QgNyBvZiAxNCBpbiBy ZXNvdXJjZXMvdGFibGVzMDEuZGF0IGZhaWxlZC4gSW5wdXQ6CiA8dGFibGU+PHNlbGVjdD48b3B0 aW9uPjM8L3NlbGVjdD48L3RhYmxlPgogR290OgogfCA8aHRtbD4KQEAgLTUxNzMsNyArNTE3Myw3 IEBAIEV4cGVjdGVkOgogfCAgICAgICAgICIzIgogfCAgICAgPHRhYmxlPgogCi1UZXN0IDggb2Yg MTAgaW4gcmVzb3VyY2VzL3RhYmxlczAxLmRhdCBmYWlsZWQuIElucHV0OgorVGVzdCA4IG9mIDE0 IGluIHJlc291cmNlcy90YWJsZXMwMS5kYXQgZmFpbGVkLiBJbnB1dDoKIDx0YWJsZT48c2VsZWN0 Pjx0YWJsZT48L3RhYmxlPjwvc2VsZWN0PjwvdGFibGU+CiBHb3Q6CiB8IDxodG1sPgpAQCAtNTE5 MSw3ICs1MTkxLDcgQEAgRXhwZWN0ZWQ6CiB8ICAgICA8dGFibGU+CiB8ICAgICA8dGFibGU+CiAK LVRlc3QgOSBvZiAxMCBpbiByZXNvdXJjZXMvdGFibGVzMDEuZGF0IGZhaWxlZC4gSW5wdXQ6CitU ZXN0IDkgb2YgMTQgaW4gcmVzb3VyY2VzL3RhYmxlczAxLmRhdCBmYWlsZWQuIElucHV0OgogPHRh YmxlPjxzZWxlY3Q+PC90YWJsZT4KIEdvdDoKIHwgPGh0bWw+CmRpZmYgLS1naXQgYS9XZWJDb3Jl L0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDk1YzczZGJjOTYxMzdjMjk2OWY3 NTVmN2ZkOTc0MzVhMDVhODAzZGUuLmI1MTg1ZTAwNGRiNTRkMWE4Y2E4NGYzNGZmYTQ0NGIwMzdm NzU4MTUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdl TG9nCkBAIC0yLDYgKzIsNDkgQEAKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KIAorICAgICAgICBBZGQgcHJvY2Vzc2luZyBmb3IgImluIGNlbGwiIG1vZGUgYW5kIGVuZCB0 YWcgcHJvY2Vzc2luZyBmb3IgImluIHJvdyIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQxNjg4CisKKyAgICAgICAgSSBhZGRlZCBzZXZlcmFsIG5ldyB0 YWJsZSB0ZXN0cywgbm90IGFsbCBvZiB3aGljaCBwYXNzIHlldC4KKyAgICAgICAgUmVtYWluaW5n IGZhaWx1cmVzIGV4aXN0IGR1ZSB0byBsYWNrIG9mIGZ1bGwgImluIHRhYmxlIGJvZHkiIG1vZGUK KyAgICAgICAgc3VwcG9ydCwgd2hpY2ggQWRhbSBoYXMgYW4gb3V0c3RhbmRpbmcgcGF0Y2ggZm9y LgorICAgICAgICBJIGJlbGlldmUgYWxsIG9mIHRoZSB2YXJpb3VzIGJyYW5jaGVzIGFkZGVkIGJ5 IHRoaXMgY2hhbmdlIGFyZQorICAgICAgICBjb3ZlcmVkIG5vdyBieSBvdXIgdGVzdHMuCisKKyAg ICAgICAgKiBodG1sL0hUTUxFbGVtZW50U3RhY2suY3BwOgorICAgICAgICAgLSBBZGRlZCBRdWFs aWZpZWROYW1lIHZlcnNpb25zIG9mIGluU2NvcGUgZnVuY3Rpb25zLgorICAgICAgICAgICBVc2lu ZyB0YWdOYW1lLmxvY2FsTmFtZSgpIGlzIHdyb25nIGZvciBub24tSFRNTCBlbGVtZW50cywKKyAg ICAgICAgICAgaW4gcHJlcGFyYXRpb24gZm9yIHN1cHBvcnRpbmcgZm9yZWlnbiBjb250ZW50IHdl IHNob3VsZCBjZW50cmFsaXplCisgICAgICAgICAgIG91ciBoYW5kbGluZyBvZiBRdWFsaWZpZWRO YW1lIGluIHRoZXNlIGZ1bmN0aW9ucyBpbnN0ZWFkIG9mCisgICAgICAgICAgIHNwcmlua2xpbmcg bW9yZSAubG9jYWxOYW1lKCkgY2FsbHMgYXJvdW5kIHRoZSBjb2RlLgorICAgICAgICAoV2ViQ29y ZTo6SFRNTEVsZW1lbnRTdGFjazo6aW5TY29wZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRWxl bWVudFN0YWNrOjppbkxpc3RJdGVtU2NvcGUpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEVsZW1l bnRTdGFjazo6aW5UYWJsZVNjb3BlKToKKyAgICAgICAgKiBodG1sL0hUTUxFbGVtZW50U3RhY2su aDoKKyAgICAgICAgKiBodG1sL0hUTUxGb3JtYXR0aW5nRWxlbWVudExpc3QuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SFRNTEZvcm1hdHRpbmdFbGVtZW50TGlzdDo6RW50cnk6Om9wZXJhdG9yPT0p OgorICAgICAgICAoV2ViQ29yZTo6SFRNTEZvcm1hdHRpbmdFbGVtZW50TGlzdDo6RW50cnk6Om9w ZXJhdG9yIT0pOgorICAgICAgICAgLSBDYWxsaW5nIGVsZW1lbnQoKSBvbiBtYXJrZXJzIHdpbGwg YXNzZXJ0LCBzbyB1c2UgbV9lbGVtZW50LgorICAgICAgICAqIGh0bWwvSFRNTFRyZWVCdWlsZGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6Y2xvc2VUaGVDZWxsKToK KyAgICAgICAgIC0gSW1wbGVtZW50ZWQgcGVyIHRoZSBzcGVjLgorICAgICAgICAoV2ViQ29yZTo6 SFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWcpOgorICAgICAgICAgLSBVc2UgaXNUYWJs ZUJvZHlDb250ZXh0VGFnIHdoZXJlIHBvc3NpYmxlLgorICAgICAgICAgLSBBZGQgSW5DZWxsTW9k ZS4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6cmVzZXRJbnNlcnRpb25Nb2Rl QXBwcm9wcmlhdGVseSk6CisgICAgICAgICAtIFVzZSBpc1RhYmxlQm9keUNvbnRleHRUYWcgd2hl cmUgcG9zc2libGUuCisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NU ckVuZFRhZ0ZvckluUm93KToKKyAgICAgICAgIC0gVGhpcyBjb2RlIGlzIG5lZWRlZCBmcm9tIGF0 IGxlYXN0IHR3byBjYWxsc2l0ZXMuCisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6 OnByb2Nlc3NFbmRUYWcpOgorICAgICAgICAgLSBBZGQgSW5DZWxsTW9kZSBhbmQgSW5Sb3dNb2Rl CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NDaGFyYWN0ZXIpOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kT2ZGaWxlKToKKyAg ICAgICAgKiBodG1sL0hUTUxUcmVlQnVpbGRlci5oOgorCisyMDEwLTA3LTA2ICBFcmljIFNlaWRl bCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKwogICAgICAgICBNYWtlIDxhPiBhdXRvLWNsb3NlIGFueSBwYXJlbnQgPGE+IHRhZwogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDE2ODQKIApkaWZm IC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50U3RhY2suY3BwIGIvV2ViQ29yZS9odG1s L0hUTUxFbGVtZW50U3RhY2suY3BwCmluZGV4IDMxYTIzNjRjMmViZjNhYjg5MmJkZDM5ZjRmNDBm Y2E0YzNmMWQwMjIuLjJlOTI4MmY4N2Q4NmZmNzVlZTg0MDg5NDAxNDdlNmZiZTk4ZmNhNzYgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudFN0YWNrLmNwcAorKysgYi9XZWJDb3Jl L2h0bWwvSFRNTEVsZW1lbnRTdGFjay5jcHAKQEAgLTMyOCwxNiArMzI4LDM0IEBAIGJvb2wgSFRN TEVsZW1lbnRTdGFjazo6aW5TY29wZShjb25zdCBBdG9taWNTdHJpbmcmIHRhcmdldFRhZykgY29u c3QKICAgICByZXR1cm4gaW5TY29wZUNvbW1vbjxpc1Njb3BlTWFya2VyPihtX3RvcC5nZXQoKSwg dGFyZ2V0VGFnKTsKIH0KIAorYm9vbCBIVE1MRWxlbWVudFN0YWNrOjppblNjb3BlKGNvbnN0IFF1 YWxpZmllZE5hbWUmIHRhZ05hbWUpIGNvbnN0Cit7CisgICAgLy8gRklYTUU6IElzIGxvY2FsTmFt ZSgpIHJpZ2h0IGZvciBub24taHRtbCBlbGVtZW50cz8KKyAgICByZXR1cm4gaW5TY29wZSh0YWdO YW1lLmxvY2FsTmFtZSgpKTsKK30KKwogYm9vbCBIVE1MRWxlbWVudFN0YWNrOjppbkxpc3RJdGVt U2NvcGUoY29uc3QgQXRvbWljU3RyaW5nJiB0YXJnZXRUYWcpIGNvbnN0CiB7CiAgICAgcmV0dXJu IGluU2NvcGVDb21tb248aXNMaXN0SXRlbVNjb3BlTWFya2VyPihtX3RvcC5nZXQoKSwgdGFyZ2V0 VGFnKTsKIH0KIAorYm9vbCBIVE1MRWxlbWVudFN0YWNrOjppbkxpc3RJdGVtU2NvcGUoY29uc3Qg UXVhbGlmaWVkTmFtZSYgdGFnTmFtZSkgY29uc3QKK3sKKyAgICAvLyBGSVhNRTogSXMgbG9jYWxO YW1lKCkgcmlnaHQgZm9yIG5vbi1odG1sIGVsZW1lbnRzPworICAgIHJldHVybiBpbkxpc3RJdGVt U2NvcGUodGFnTmFtZS5sb2NhbE5hbWUoKSk7Cit9CisKIGJvb2wgSFRNTEVsZW1lbnRTdGFjazo6 aW5UYWJsZVNjb3BlKGNvbnN0IEF0b21pY1N0cmluZyYgdGFyZ2V0VGFnKSBjb25zdAogewogICAg IHJldHVybiBpblNjb3BlQ29tbW9uPGlzVGFibGVTY29wZU1hcmtlcj4obV90b3AuZ2V0KCksIHRh cmdldFRhZyk7CiB9CiAKK2Jvb2wgSFRNTEVsZW1lbnRTdGFjazo6aW5UYWJsZVNjb3BlKGNvbnN0 IFF1YWxpZmllZE5hbWUmIHRhZ05hbWUpIGNvbnN0Cit7CisgICAgLy8gRklYTUU6IElzIGxvY2Fs TmFtZSgpIHJpZ2h0IGZvciBub24taHRtbCBlbGVtZW50cz8KKyAgICByZXR1cm4gaW5UYWJsZVNj b3BlKHRhZ05hbWUubG9jYWxOYW1lKCkpOworfQorCiBFbGVtZW50KiBIVE1MRWxlbWVudFN0YWNr OjpodG1sRWxlbWVudCgpIGNvbnN0CiB7CiAgICAgQVNTRVJUKG1faHRtbEVsZW1lbnQpOwpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50U3RhY2suaCBiL1dlYkNvcmUvaHRtbC9I VE1MRWxlbWVudFN0YWNrLmgKaW5kZXggMWRiNGMyMGI5OGRmNjQ3NTQ1MzEwZTAyZmJlOTRkZjU0 ZThiZTBkNi4uNjkwMzU5MDQ0NjgxNzM3OGYyOTRhMDRkNDM2YzYxYTgwYTFlOGQ4OCAxMDA2NDQK LS0tIGEvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50U3RhY2suaAorKysgYi9XZWJDb3JlL2h0bWwv SFRNTEVsZW1lbnRTdGFjay5oCkBAIC0zNSw2ICszNSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogY2xhc3MgQXRvbWljU3RyaW5nOwogY2xhc3MgRWxlbWVudDsKK2NsYXNzIFF1YWxpZmllZE5h bWU7CiAKIC8vIE5PVEU6IFRoZSBIVE1MNSBzcGVjIHVzZXMgYSBiYWNrd2FyZHMgKGdyb3dzIGRv d253YXJkKSBzdGFjay4gIFdlJ3JlIHVzaW5nCiAvLyBtb3JlIHN0YW5kYXJkIChncm93cyB1cHdh cmRzKSBzdGFjayB0ZXJtaW5vbG9neSBoZXJlLgpAQCAtOTUsOCArOTYsMTEgQEAgcHVibGljOgog CiAgICAgYm9vbCBpblNjb3BlKEVsZW1lbnQqKSBjb25zdDsKICAgICBib29sIGluU2NvcGUoY29u c3QgQXRvbWljU3RyaW5nJiB0YWdOYW1lKSBjb25zdDsKKyAgICBib29sIGluU2NvcGUoY29uc3Qg UXVhbGlmaWVkTmFtZSYpIGNvbnN0OwogICAgIGJvb2wgaW5MaXN0SXRlbVNjb3BlKGNvbnN0IEF0 b21pY1N0cmluZyYgdGFnTmFtZSkgY29uc3Q7CisgICAgYm9vbCBpbkxpc3RJdGVtU2NvcGUoY29u c3QgUXVhbGlmaWVkTmFtZSYpIGNvbnN0OwogICAgIGJvb2wgaW5UYWJsZVNjb3BlKGNvbnN0IEF0 b21pY1N0cmluZyYgdGFnTmFtZSkgY29uc3Q7CisgICAgYm9vbCBpblRhYmxlU2NvcGUoY29uc3Qg UXVhbGlmaWVkTmFtZSYpIGNvbnN0OwogCiAgICAgRWxlbWVudCogaHRtbEVsZW1lbnQoKSBjb25z dDsKICAgICBFbGVtZW50KiBoZWFkRWxlbWVudCgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9odG1sL0hUTUxGb3JtYXR0aW5nRWxlbWVudExpc3QuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxG b3JtYXR0aW5nRWxlbWVudExpc3QuY3BwCmluZGV4IDA2OGY3M2I3MzFmOGEzNjViMWRlMGMzZTU0 MGNmNThjNTc3YTFlYWUuLjgxOGJmYjM5MzY2YmQ2ZDEwMWVlOTkwN2RkZmIyOWNhMjFjNzJhYmEg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MRm9ybWF0dGluZ0VsZW1lbnRMaXN0LmNwcAor KysgYi9XZWJDb3JlL2h0bWwvSFRNTEZvcm1hdHRpbmdFbGVtZW50TGlzdC5jcHAKQEAgLTY2LDEy ICs2NiwxMiBAQCB2b2lkIEhUTUxGb3JtYXR0aW5nRWxlbWVudExpc3Q6OkVudHJ5OjpyZXBsYWNl RWxlbWVudChQYXNzUmVmUHRyPEVsZW1lbnQ+IGVsZW1lbgogCiBib29sIEhUTUxGb3JtYXR0aW5n RWxlbWVudExpc3Q6OkVudHJ5OjpvcGVyYXRvcj09KGNvbnN0IEVudHJ5JiBvdGhlcikgY29uc3QK IHsKLSAgICByZXR1cm4gZWxlbWVudCgpID09IG90aGVyLmVsZW1lbnQoKTsKKyAgICByZXR1cm4g bV9lbGVtZW50ID09IG90aGVyLm1fZWxlbWVudDsKIH0KIAogYm9vbCBIVE1MRm9ybWF0dGluZ0Vs ZW1lbnRMaXN0OjpFbnRyeTo6b3BlcmF0b3IhPShjb25zdCBFbnRyeSYgb3RoZXIpIGNvbnN0CiB7 Ci0gICAgcmV0dXJuIGVsZW1lbnQoKSAhPSBvdGhlci5lbGVtZW50KCk7CisgICAgcmV0dXJuIG1f ZWxlbWVudCAhPSBvdGhlci5tX2VsZW1lbnQ7CiB9CiAKIEhUTUxGb3JtYXR0aW5nRWxlbWVudExp c3Q6OkhUTUxGb3JtYXR0aW5nRWxlbWVudExpc3QoKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1s L0hUTUxUcmVlQnVpbGRlci5jcHAgYi9XZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcApp bmRleCBjMjhhOGI5YWQxYmRjNzI2NzgxZTUwYzdkZWRlYTc0ZmE5ZjJmYjZlLi5iNTA4NDNkOTlk ZjFlMjk2NzczNzIxMmFhM2M1NWI2NWZhZGJlOTg4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwv SFRNTFRyZWVCdWlsZGVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmNw cApAQCAtNzU2LDYgKzc1NiwyMCBAQCBib29sIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0NvbGdy b3VwRW5kVGFnRm9ySW5Db2x1bW5Hcm91cCgpCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKKy8vIGh0 dHA6Ly93d3cud2hhdHdnLm9yZy9zcGVjcy93ZWItYXBwcy9jdXJyZW50LXdvcmsvbXVsdGlwYWdl L3Rva2VuaXphdGlvbi5odG1sI2Nsb3NlLXRoZS1jZWxsCit2b2lkIEhUTUxUcmVlQnVpbGRlcjo6 Y2xvc2VUaGVDZWxsKCkKK3sKKyAgICBBU1NFUlQoaW5zZXJ0aW9uTW9kZSgpID09IEluQ2VsbE1v ZGUpOworICAgIGlmIChtX29wZW5FbGVtZW50cy5pblNjb3BlKHRkVGFnKSkgeworICAgICAgICBB U1NFUlQoIW1fb3BlbkVsZW1lbnRzLmluU2NvcGUodGhUYWcpKTsKKyAgICAgICAgcHJvY2Vzc0Zh a2VFbmRUYWcodGRUYWcpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIEFTU0VSVChtX29w ZW5FbGVtZW50cy5pblNjb3BlKHRoVGFnKSk7CisgICAgcHJvY2Vzc0Zha2VFbmRUYWcodGhUYWcp OworICAgIEFTU0VSVChpbnNlcnRpb25Nb2RlKCkgPT0gSW5Sb3dNb2RlKTsKK30KKwogdm9pZCBI VE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZyhBdG9taWNIVE1MVG9rZW4mIHRva2VuKQog ewogICAgIEFTU0VSVCh0b2tlbi50eXBlKCkgPT0gSFRNTFRva2VuOjpTdGFydFRhZyk7CkBAIC04 ODAsNyArODk0LDcgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZyhBdG9t aWNIVE1MVG9rZW4mIHRva2VuKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAg ICAgIHBhcnNlRXJyb3IodG9rZW4pOwotICAgICAgICBpZiAoY3VycmVudEVsZW1lbnQoKS0+aGFz VGFnTmFtZSh0YWJsZVRhZykgfHwgY3VycmVudEVsZW1lbnQoKS0+aGFzVGFnTmFtZSh0Ym9keVRh ZykgfHwgY3VycmVudEVsZW1lbnQoKS0+aGFzVGFnTmFtZSh0Zm9vdFRhZykgfHwgY3VycmVudEVs ZW1lbnQoKS0+aGFzVGFnTmFtZSh0aGVhZFRhZykgfHwgY3VycmVudEVsZW1lbnQoKS0+aGFzVGFn TmFtZSh0clRhZykpCisgICAgICAgIGlmIChjdXJyZW50RWxlbWVudCgpLT5oYXNUYWdOYW1lKHRh YmxlVGFnKSB8fCBpc1RhYmxlQm9keUNvbnRleHRUYWcoY3VycmVudEVsZW1lbnQoKS0+bG9jYWxO YW1lKCkpIHx8IGN1cnJlbnRFbGVtZW50KCktPmhhc1RhZ05hbWUodHJUYWcpKQogICAgICAgICAg ICAgbm90SW1wbGVtZW50ZWQoKTsgLy8gIndoZW5ldmVyIGEgbm9kZSB3b3VsZCBiZSBpbnNlcnRl ZCBpbnRvIHRoZSBjdXJyZW50IG5vZGUsIGl0IG11c3QgaW5zdGVhZCBiZSBmb3N0ZXIgcGFyZW50 ZWQuIgogICAgICAgICBwcm9jZXNzU3RhcnRUYWdGb3JJbkJvZHkodG9rZW4pOwogICAgICAgICBi cmVhazsKQEAgLTkzNSw2ICs5NDksNyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0 YXJ0VGFnKEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7 IC8vIHByb2Nlc3MgdXNpbmcgImluIHRhYmxlIiBydWxlcwogICAgICAgICBicmVhazsKICAgICBj YXNlIEluUm93TW9kZToKKyAgICAgICAgQVNTRVJUKGluc2VydGlvbk1vZGUoKSA9PSBJblJvd01v ZGUpOwogICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IHRoVGFnIHx8IHRva2VuLm5hbWUoKSA9 PSB0ZFRhZykgewogICAgICAgICAgICAgbV9vcGVuRWxlbWVudHMucG9wVW50aWxUYWJsZVJvd1Nj b3BlTWFya2VyKCk7CiAgICAgICAgICAgICBpbnNlcnRFbGVtZW50KHRva2VuKTsKQEAgLTk0Miwx MSArOTU3LDI5IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWcoQXRvbWlj SFRNTFRva2VuJiB0b2tlbikKICAgICAgICAgICAgIG1fYWN0aXZlRm9ybWF0dGluZ0VsZW1lbnRz LmFwcGVuZE1hcmtlcigpOwogICAgICAgICB9CiAgICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0g Y2FwdGlvblRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gY29sVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBj b2xncm91cFRhZyB8fCBpc1RhYmxlQm9keUNvbnRleHRUYWcodG9rZW4ubmFtZSgpKSkgewotICAg ICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAgIGlmICghcHJvY2Vzc1RyRW5k VGFnRm9ySW5Sb3coKSkgeworICAgICAgICAgICAgICAgIEFTU0VSVChtX2lzUGFyc2luZ0ZyYWdt ZW50KTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisgICAgICAgICAg ICBBU1NFUlQoaW5zZXJ0aW9uTW9kZSgpID09IEluVGFibGVCb2R5TW9kZSk7CisgICAgICAgICAg ICBwcm9jZXNzU3RhcnRUYWcodG9rZW4pOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9 CiAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgSW5D ZWxsTW9kZToKKyAgICAgICAgQVNTRVJUKGluc2VydGlvbk1vZGUoKSA9PSBJbkNlbGxNb2RlKTsK KyAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBjYXB0aW9uVGFnIHx8IHRva2VuLm5hbWUoKSA9 PSBjb2xUYWcgfHwgdG9rZW4ubmFtZSgpID09IGNvbGdyb3VwVGFnIHx8IHRva2VuLm5hbWUoKSA9 PSB0aFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gdGRUYWcgfHwgaXNUYWJsZUJvZHlDb250ZXh0VGFn KHRva2VuLm5hbWUoKSkpIHsKKyAgICAgICAgICAgIC8vIEZJWE1FOiBUaGlzIGNvdWxkIGJlIG1v cmUgZWZmaWNpZW50LgorICAgICAgICAgICAgaWYgKCFtX29wZW5FbGVtZW50cy5pblRhYmxlU2Nv cGUodGRUYWcpIHx8ICFtX29wZW5FbGVtZW50cy5pblRhYmxlU2NvcGUodGhUYWcpKSB7CisgICAg ICAgICAgICAgICAgcGFyc2VFcnJvcih0b2tlbik7CisgICAgICAgICAgICAgICAgcmV0dXJuOwor ICAgICAgICAgICAgfQorICAgICAgICAgICAgY2xvc2VUaGVDZWxsKCk7CisgICAgICAgICAgICBy ZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgcHJvY2Vzc1N0YXJ0VGFnRm9ySW5Cb2R5KHRva2Vu KTsKKyAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBBZnRlckJvZHlNb2RlOgogICAgIGNhc2UgQWZ0 ZXJBZnRlckJvZHlNb2RlOgogICAgICAgICBBU1NFUlQoaW5zZXJ0aW9uTW9kZSgpID09IEFmdGVy Qm9keU1vZGUgfHwgaW5zZXJ0aW9uTW9kZSgpID09IEFmdGVyQWZ0ZXJCb2R5TW9kZSk7CkBAIC0x Mjk4LDcgKzEzMzEsNyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cmVzZXRJbnNlcnRpb25Nb2Rl QXBwcm9wcmlhdGVseSgpCiAgICAgICAgICAgICByZXR1cm4gc2V0SW5zZXJ0aW9uTW9kZUFuZEVu ZChJbkNlbGxNb2RlLCBmb3JlaWduKTsKICAgICAgICAgaWYgKG5vZGUtPmhhc1RhZ05hbWUodHJU YWcpKQogICAgICAgICAgICAgcmV0dXJuIHNldEluc2VydGlvbk1vZGVBbmRFbmQoSW5Sb3dNb2Rl LCBmb3JlaWduKTsKLSAgICAgICAgaWYgKG5vZGUtPmhhc1RhZ05hbWUodGJvZHlUYWcpIHx8IG5v ZGUtPmhhc1RhZ05hbWUodGhlYWRUYWcpIHx8IG5vZGUtPmhhc1RhZ05hbWUodGZvb3RUYWcpKQor ICAgICAgICBpZiAoaXNUYWJsZUJvZHlDb250ZXh0VGFnKG5vZGUtPmxvY2FsTmFtZSgpKSkKICAg ICAgICAgICAgIHJldHVybiBzZXRJbnNlcnRpb25Nb2RlQW5kRW5kKEluVGFibGVCb2R5TW9kZSwg Zm9yZWlnbik7CiAgICAgICAgIGlmIChub2RlLT5oYXNUYWdOYW1lKGNhcHRpb25UYWcpKQogICAg ICAgICAgICAgcmV0dXJuIHNldEluc2VydGlvbk1vZGVBbmRFbmQoSW5DYXB0aW9uTW9kZSwgZm9y ZWlnbik7CkBAIC0xNDc0LDYgKzE1MDcsMjAgQEAgYm9vbCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nl c3NDYXB0aW9uRW5kVGFnRm9ySW5DYXB0aW9uKCkKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorYm9v bCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NUckVuZFRhZ0ZvckluUm93KCkKK3sKKyAgICBpZiAo IW1fb3BlbkVsZW1lbnRzLmluVGFibGVTY29wZSh0clRhZy5sb2NhbE5hbWUoKSkpIHsKKyAgICAg ICAgQVNTRVJUKG1faXNQYXJzaW5nRnJhZ21lbnQpOworICAgICAgICAvLyBGSVhNRTogcGFyc2Ug ZXJyb3IKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKyAgICBtX29wZW5FbGVtZW50cy5w b3BVbnRpbFRhYmxlUm93U2NvcGVNYXJrZXIoKTsKKyAgICBBU1NFUlQoY3VycmVudEVsZW1lbnQo KS0+aGFzVGFnTmFtZSh0clRhZykpOworICAgIG1fb3BlbkVsZW1lbnRzLnBvcCgpOworICAgIG1f aW5zZXJ0aW9uTW9kZSA9IEluVGFibGVCb2R5TW9kZTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwog dm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRUYWcoQXRvbWljSFRNTFRva2VuJiB0b2tl bikKIHsKICAgICBBU1NFUlQodG9rZW4udHlwZSgpID09IEhUTUxUb2tlbjo6RW5kVGFnKTsKQEAg LTE1ODAsNiArMTYyNyw3MiBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0VuZFRhZyhB dG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgICAgICB9CiAgICAgICAgIHByb2Nlc3NFbmRUYWco dG9rZW4pOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIEluUm93TW9kZToKKyAgICAgICAgQVNT RVJUKGluc2VydGlvbk1vZGUoKSA9PSBJblJvd01vZGUpOworICAgICAgICBpZiAodG9rZW4ubmFt ZSgpID09IHRyVGFnKSB7CisgICAgICAgICAgICBwcm9jZXNzVHJFbmRUYWdGb3JJblJvdygpOwor ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIGlmICh0b2tlbi5uYW1lKCkg PT0gdGFibGVUYWcpIHsKKyAgICAgICAgICAgIGlmICghcHJvY2Vzc1RyRW5kVGFnRm9ySW5Sb3co KSkgeworICAgICAgICAgICAgICAgIEFTU0VSVChtX2lzUGFyc2luZ0ZyYWdtZW50KTsKKyAgICAg ICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisgICAgICAgICAgICBBU1NFUlQoaW5z ZXJ0aW9uTW9kZSgpID09IEluVGFibGVCb2R5TW9kZSk7CisgICAgICAgICAgICBwcm9jZXNzRW5k VGFnKHRva2VuKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBpZiAo aXNUYWJsZUJvZHlDb250ZXh0VGFnKHRva2VuLm5hbWUoKSkpIHsKKyAgICAgICAgICAgIGlmICgh bV9vcGVuRWxlbWVudHMuaW5UYWJsZVNjb3BlKHRva2VuLm5hbWUoKSkpIHsKKyAgICAgICAgICAg ICAgICBwYXJzZUVycm9yKHRva2VuKTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAg ICAgICB9CisgICAgICAgICAgICBwcm9jZXNzRmFrZUVuZFRhZyh0clRhZyk7CisgICAgICAgICAg ICBBU1NFUlQoaW5zZXJ0aW9uTW9kZSgpID09IEluVGFibGVCb2R5TW9kZSk7CisgICAgICAgICAg ICBwcm9jZXNzRW5kVGFnKHRva2VuKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQor ICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IGJvZHlUYWcgfHwgdG9rZW4ubmFtZSgpID09IGNh cHRpb25UYWcgfHwgdG9rZW4ubmFtZSgpID09IGNvbFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gY29s Z3JvdXBUYWcgfHwgdG9rZW4ubmFtZSgpID09IGh0bWxUYWcgfHwgdG9rZW4ubmFtZSgpID09IHRk VGFnIHx8IHRva2VuLm5hbWUoKSA9PSB0aFRhZykgeworICAgICAgICAgICAgcGFyc2VFcnJvcih0 b2tlbik7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgbm90SW1wbGVt ZW50ZWQoKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBJbkNlbGxNb2RlOgorICAgICAgICBB U1NFUlQoaW5zZXJ0aW9uTW9kZSgpID09IEluQ2VsbE1vZGUpOworICAgICAgICBpZiAodG9rZW4u bmFtZSgpID09IHRoVGFnIHx8IHRva2VuLm5hbWUoKSA9PSB0ZFRhZykgeworICAgICAgICAgICAg aWYgKCFtX29wZW5FbGVtZW50cy5pblRhYmxlU2NvcGUodG9rZW4ubmFtZSgpKSkgeworICAgICAg ICAgICAgICAgIHBhcnNlRXJyb3IodG9rZW4pOworICAgICAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgICAgIH0KKyAgICAgICAgICAgIGdlbmVyYXRlSW1wbGllZEVuZFRhZ3MoKTsKKyAgICAg ICAgICAgIGlmICghY3VycmVudEVsZW1lbnQoKS0+aGFzTG9jYWxOYW1lKHRva2VuLm5hbWUoKSkp CisgICAgICAgICAgICAgICAgcGFyc2VFcnJvcih0b2tlbik7CisgICAgICAgICAgICBtX29wZW5F bGVtZW50cy5wb3BVbnRpbCh0b2tlbi5uYW1lKCkpOworICAgICAgICAgICAgbV9vcGVuRWxlbWVu dHMucG9wKCk7CisgICAgICAgICAgICBtX2FjdGl2ZUZvcm1hdHRpbmdFbGVtZW50cy5jbGVhclRv TGFzdE1hcmtlcigpOworICAgICAgICAgICAgbV9pbnNlcnRpb25Nb2RlID0gSW5Sb3dNb2RlOwor ICAgICAgICAgICAgQVNTRVJUKGN1cnJlbnRFbGVtZW50KCktPmhhc1RhZ05hbWUodHJUYWcpKTsK KyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBpZiAodG9rZW4ubmFtZSgp ID09IGJvZHlUYWcgfHwgdG9rZW4ubmFtZSgpID09IGNhcHRpb25UYWcgfHwgdG9rZW4ubmFtZSgp ID09IGNvbFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gY29sZ3JvdXBUYWcgfHwgdG9rZW4ubmFtZSgp ID09IGh0bWxUYWcpIHsKKyAgICAgICAgICAgIHBhcnNlRXJyb3IodG9rZW4pOworICAgICAgICAg ICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gdGFibGVU YWcgfHwgdG9rZW4ubmFtZSgpID09IHRyVGFnIHx8IGlzVGFibGVCb2R5Q29udGV4dFRhZyh0b2tl bi5uYW1lKCkpKSB7CisgICAgICAgICAgICBpZiAoIW1fb3BlbkVsZW1lbnRzLmluVGFibGVTY29w ZSh0b2tlbi5uYW1lKCkpKSB7CisgICAgICAgICAgICAgICAgQVNTRVJUKG1faXNQYXJzaW5nRnJh Z21lbnQpOworICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBJdCBpcyB1bmNsZWFyIHdoYXQgdGhl IGV4YWN0IEFTU0VSVCBzaG91bGQgYmUuCisgICAgICAgICAgICAgICAgLy8gaHR0cDovL3d3dy53 My5vcmcvQnVncy9QdWJsaWMvc2hvd19idWcuY2dpP2lkPTEwMDk4CisgICAgICAgICAgICAgICAg cGFyc2VFcnJvcih0b2tlbik7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAg fQorICAgICAgICAgICAgY2xvc2VUaGVDZWxsKCk7CisgICAgICAgICAgICBwcm9jZXNzRW5kVGFn KHRva2VuKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBwcm9jZXNz RW5kVGFnRm9ySW5Cb2R5KHRva2VuKTsKKyAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBBZnRlckJv ZHlNb2RlOgogICAgICAgICBBU1NFUlQoaW5zZXJ0aW9uTW9kZSgpID09IEFmdGVyQm9keU1vZGUp OwogICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IGh0bWxUYWcpIHsKQEAgLTE3NDEsMTIgKzE4 NTQsMTQgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NDaGFyYWN0ZXIoQXRvbWljSFRN TFRva2VuJiB0b2tlbikKICAgICAgICAgLy8gRmFsbCB0aHJvdWdoCiAgICAgY2FzZSBJbkJvZHlN b2RlOgogICAgIGNhc2UgSW5DYXB0aW9uTW9kZToKLSAgICAgICAgQVNTRVJUKGluc2VydGlvbk1v ZGUoKSA9PSBJbkJvZHlNb2RlIHx8IGluc2VydGlvbk1vZGUoKSA9PSBJbkNhcHRpb25Nb2RlKTsK KyAgICBjYXNlIEluQ2VsbE1vZGU6CisgICAgICAgIEFTU0VSVChpbnNlcnRpb25Nb2RlKCkgPT0g SW5Cb2R5TW9kZSB8fCBpbnNlcnRpb25Nb2RlKCkgPT0gSW5DYXB0aW9uTW9kZSB8fCBpbnNlcnRp b25Nb2RlKCkgPT0gSW5DZWxsTW9kZSk7CiAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7CiAgICAg ICAgIGluc2VydFRleHROb2RlKHRva2VuKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBJblRh YmxlTW9kZToKLSAgICAgICAgQVNTRVJUKGluc2VydGlvbk1vZGUoKSA9PSBJblRhYmxlTW9kZSk7 CisgICAgY2FzZSBJblJvd01vZGU6CisgICAgICAgIEFTU0VSVChpbnNlcnRpb25Nb2RlKCkgPT0g SW5UYWJsZU1vZGUgfHwgaW5zZXJ0aW9uTW9kZSgpID09IEluUm93TW9kZSk7CiAgICAgICAgIG5v dEltcGxlbWVudGVkKCk7IC8vIENyYXp5IHBlbmRpbmcgY2hhcmFjdGVycy4KICAgICAgICAgaW5z ZXJ0VGV4dE5vZGUodG9rZW4pOwogICAgICAgICBicmVhazsKQEAgLTE4MTEsNyArMTkyNiw4IEBA IHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kT2ZGaWxlKEF0b21pY0hUTUxUb2tlbiYg dG9rZW4pCiAgICAgICAgIHByb2Nlc3NEZWZhdWx0Rm9yQWZ0ZXJIZWFkTW9kZSh0b2tlbik7CiAg ICAgICAgIC8vIEZhbGwgdGhyb3VnaAogICAgIGNhc2UgSW5Cb2R5TW9kZToKLSAgICAgICAgQVNT RVJUKGluc2VydGlvbk1vZGUoKSA9PSBJbkJvZHlNb2RlKTsKKyAgICBjYXNlIEluQ2VsbE1vZGU6 CisgICAgICAgIEFTU0VSVChpbnNlcnRpb25Nb2RlKCkgPT0gSW5Cb2R5TW9kZSB8fCBpbnNlcnRp b25Nb2RlKCkgPT0gSW5DZWxsTW9kZSk7CiAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7CiAgICAg ICAgIGJyZWFrOwogICAgIGNhc2UgQWZ0ZXJCb2R5TW9kZToKZGlmZiAtLWdpdCBhL1dlYkNvcmUv aHRtbC9IVE1MVHJlZUJ1aWxkZXIuaCBiL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuaApp bmRleCA2MWIxMWQyOWQ3MjhmYmNjZTYxMGZiNDBkNWY3M2M5NTYyOTgwOWM3Li4yOTNiOWE4YzEw NzMwODlmMjk0ZTkzNmVjMzAzY2MzYmZhNDBlOGI1IDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwv SFRNTFRyZWVCdWlsZGVyLmgKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5oCkBA IC0xMjksNiArMTI5LDcgQEAgcHJpdmF0ZToKICAgICBib29sIHByb2Nlc3NCb2R5RW5kVGFnRm9y SW5Cb2R5KEF0b21pY0hUTUxUb2tlbiYpOwogICAgIGJvb2wgcHJvY2Vzc0NhcHRpb25FbmRUYWdG b3JJbkNhcHRpb24oKTsKICAgICBib29sIHByb2Nlc3NDb2xncm91cEVuZFRhZ0ZvckluQ29sdW1u R3JvdXAoKTsKKyAgICBib29sIHByb2Nlc3NUckVuZFRhZ0ZvckluUm93KCk7CiAgICAgdm9pZCBw cm9jZXNzQW55T3RoZXJFbmRUYWdGb3JJbkJvZHkoQXRvbWljSFRNTFRva2VuJik7CiAKICAgICB2 b2lkIHByb2Nlc3NGYWtlU3RhcnRUYWcoY29uc3QgUXVhbGlmaWVkTmFtZSYsIFBhc3NSZWZQdHI8 TmFtZWROb2RlTWFwPiBhdHRyaWJ1dGVzID0gMCk7CkBAIC0xNDEsNiArMTQyLDggQEAgcHJpdmF0 ZToKICAgICB2b2lkIHJlcGFyZW50Q2hpbGRyZW4oRWxlbWVudCogb2xkUGFyZW50LCBFbGVtZW50 KiBuZXdQYXJlbnQpOwogICAgIHZvaWQgY2FsbFRoZUFkb3B0aW9uQWdlbmN5KEF0b21pY0hUTUxU b2tlbiYpOwogCisgICAgdm9pZCBjbG9zZVRoZUNlbGwoKTsKKwogICAgIHRlbXBsYXRlPHR5cGVu YW1lIENoaWxkVHlwZT4KICAgICBQYXNzUmVmUHRyPENoaWxkVHlwZT4gYXR0YWNoKE5vZGUqIHBh cmVudCwgUGFzc1JlZlB0cjxDaGlsZFR5cGU+IHBycENoaWxkKQogICAgIHsK