42022 2010-07-10 00:30:13 -0700 HTMLTreeBuilder needs adjustForeignAttributes support 2010-07-10 02:01:52 -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 commit-queue oldest_to_newest 249482 0 eric 2010-07-10 00:30:13 -0700 HTMLTreeBuilder needs adjustForeignAttributes support 249484 1 61144 eric 2010-07-10 00:37:22 -0700 Created attachment 61144 Patch 249486 2 61144 abarth 2010-07-10 00:49:40 -0700 Comment on attachment 61144 Patch You like re-writing this code, huh? :) WebCore/html/HTMLTreeBuilder.cpp:727 + for (unsigned x = 0; x < attributes->length(); ++x) { you and your x 249497 3 61144 commit-queue 2010-07-10 02:01:47 -0700 Comment on attachment 61144 Patch Clearing flags on attachment: 61144 Committed r63045: <http://trac.webkit.org/changeset/63045> 249498 4 commit-queue 2010-07-10 02:01:52 -0700 All reviewed patches have been landed. Closing bug. 61144 2010-07-10 00:37:22 -0700 2010-07-10 02:01:47 -0700 Patch bug-42022-20100710003721.patch text/plain 11579 eric ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkMTUxMzkwODUzM2I5OTFhYjJlYTgxYWFiMmI4MDEzZWYyZDgwOGFhLi44NmM3NWMw NzdhYTBmY2NjMjliM2FjOTFmMmI2OGU0ZTdkN2Y2NTFkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTAtMDctMTAgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhUTUxUcmVlQnVpbGRlciBuZWVk cyBhZGp1c3RGb3JlaWduQXR0cmlidXRlcyBzdXBwb3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjAyMgorCisgICAgICAgICogaHRtbDVsaWIvcnVu bmVyLWV4cGVjdGVkLWh0bWw1LnR4dDoKKyAgICAgICAgIC0gV2Ugbm93IHBhc3MgMyBtb3JlIHRl c3RzLgorCiAyMDEwLTA3LTA5ICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgT2phbiBWYWZhaS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0 bWw1bGliL3J1bm5lci1leHBlY3RlZC1odG1sNS50eHQgYi9MYXlvdXRUZXN0cy9odG1sNWxpYi9y dW5uZXItZXhwZWN0ZWQtaHRtbDUudHh0CmluZGV4IDI0YjdmNDAxNDUzNWI2NWUxZTMzZjE3MmE1 ODcyZWVjOTY3NzE2N2YuLjAzZGM0MmIzOTA1M2RhMDdlNDJmMTI3ZTc0ZWQ4YzEzYTZhNjE5YmUg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0bWw1bGliL3J1bm5lci1leHBlY3RlZC1odG1sNS50 eHQKKysrIGIvTGF5b3V0VGVzdHMvaHRtbDVsaWIvcnVubmVyLWV4cGVjdGVkLWh0bWw1LnR4dApA QCAtOTEwLDEwICs5MTAsNiBAQCByZXNvdXJjZXMvdGVzdHMxMC5kYXQ6CiAxNQogMTgKIDE5Ci0y MgotMjMKLTI0Ci0yNQogCiBUZXN0IDEzIG9mIDI1IGluIHJlc291cmNlcy90ZXN0czEwLmRhdCBm YWlsZWQuIElucHV0OgogPCFET0NUWVBFIGh0bWw+PGJvZHk+PHRhYmxlPjxjYXB0aW9uPjxzdmc+ PGc+Zm9vPC9nPjxnPmJhcjwvZz48cD5iYXo8L3RhYmxlPjxwPnF1dXgKQEAgLTEwNzEsMTAyICsx MDY3LDYgQEAgRXhwZWN0ZWQ6CiB8ICAgICAgICAgImJhciIKIHwgICAgIDxwPgogfCAgICAgICAi YmF6IgotCi1UZXN0IDIyIG9mIDI1IGluIHJlc291cmNlcy90ZXN0czEwLmRhdCBmYWlsZWQuIElu cHV0OgotPCFET0NUWVBFIGh0bWw+PGJvZHkgeGxpbms6aHJlZj1mb28+PHN2ZyB4bGluazpocmVm PWZvbz48L3N2Zz4KLUdvdDoKLXwgPCFET0NUWVBFIGh0bWw+Ci18IDxodG1sPgotfCAgIDxoZWFk PgotfCAgIDxib2R5PgotfCAgICAgeGxpbms6aHJlZj0iZm9vIgotfCAgICAgPHN2ZyBzdmc+Ci18 ICAgICAgIHhsaW5rOmhyZWY9ImZvbyIKLUV4cGVjdGVkOgotfCA8IURPQ1RZUEUgaHRtbD4KLXwg PGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICB4bGluazpocmVmPSJmb28iCi18 ICAgICA8c3ZnIHN2Zz4KLXwgICAgICAgeGxpbmsgaHJlZj0iZm9vIgotCi1UZXN0IDIzIG9mIDI1 IGluIHJlc291cmNlcy90ZXN0czEwLmRhdCBmYWlsZWQuIElucHV0OgotPCFET0NUWVBFIGh0bWw+ PGJvZHkgeGxpbms6aHJlZj1mb28geG1sOmxhbmc9ZW4+PHN2Zz48ZyB4bWw6bGFuZz1lbiB4bGlu azpocmVmPWZvbz48L2c+PC9zdmc+Ci1Hb3Q6Ci18IDwhRE9DVFlQRSBodG1sPgotfCA8aHRtbD4K LXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIHhsaW5rOmhyZWY9ImZvbyIKLXwgICAgIHht bDpsYW5nPSJlbiIKLXwgICAgIDxzdmcgc3ZnPgotfCAgICAgICA8c3ZnIGc+Ci18ICAgICAgICAg eGxpbms6aHJlZj0iZm9vIgotfCAgICAgICAgIHhtbDpsYW5nPSJlbiIKLUV4cGVjdGVkOgotfCA8 IURPQ1RZUEUgaHRtbD4KLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICB4 bGluazpocmVmPSJmb28iCi18ICAgICB4bWw6bGFuZz0iZW4iCi18ICAgICA8c3ZnIHN2Zz4KLXwg ICAgICAgPHN2ZyBnPgotfCAgICAgICAgIHhsaW5rIGhyZWY9ImZvbyIKLXwgICAgICAgICB4bWwg bGFuZz0iZW4iCi0KLVRlc3QgMjQgb2YgMjUgaW4gcmVzb3VyY2VzL3Rlc3RzMTAuZGF0IGZhaWxl ZC4gSW5wdXQ6Ci08IURPQ1RZUEUgaHRtbD48Ym9keSB4bGluazpocmVmPWZvbyB4bWw6bGFuZz1l bj48c3ZnPjxnIHhtbDpsYW5nPWVuIHhsaW5rOmhyZWY9Zm9vIC8+PC9zdmc+Ci1Hb3Q6Ci18IDwh RE9DVFlQRSBodG1sPgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIHhs aW5rOmhyZWY9ImZvbyIKLXwgICAgIHhtbDpsYW5nPSJlbiIKLXwgICAgIDxzdmcgc3ZnPgotfCAg ICAgICA8c3ZnIGc+Ci18ICAgICAgICAgeGxpbms6aHJlZj0iZm9vIgotfCAgICAgICAgIHhtbDps YW5nPSJlbiIKLUV4cGVjdGVkOgotfCA8IURPQ1RZUEUgaHRtbD4KLXwgPGh0bWw+Ci18ICAgPGhl YWQ+Ci18ICAgPGJvZHk+Ci18ICAgICB4bGluazpocmVmPSJmb28iCi18ICAgICB4bWw6bGFuZz0i ZW4iCi18ICAgICA8c3ZnIHN2Zz4KLXwgICAgICAgPHN2ZyBnPgotfCAgICAgICAgIHhsaW5rIGhy ZWY9ImZvbyIKLXwgICAgICAgICB4bWwgbGFuZz0iZW4iCi0KLVRlc3QgMjUgb2YgMjUgaW4gcmVz b3VyY2VzL3Rlc3RzMTAuZGF0IGZhaWxlZC4gSW5wdXQ6Ci08IURPQ1RZUEUgaHRtbD48Ym9keSB4 bGluazpocmVmPWZvbyB4bWw6bGFuZz1lbj48c3ZnPjxnIHhtbDpsYW5nPWVuIHhsaW5rOmhyZWY9 Zm9vIC8+YmFyPC9zdmc+Ci1Hb3Q6Ci18IDwhRE9DVFlQRSBodG1sPgotfCA8aHRtbD4KLXwgICA8 aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIHhsaW5rOmhyZWY9ImZvbyIKLXwgICAgIHhtbDpsYW5n PSJlbiIKLXwgICAgIDxzdmcgc3ZnPgotfCAgICAgICA8c3ZnIGc+Ci18ICAgICAgICAgeGxpbms6 aHJlZj0iZm9vIgotfCAgICAgICAgIHhtbDpsYW5nPSJlbiIKLXwgICAgICAgImJhciIKLUV4cGVj dGVkOgotfCA8IURPQ1RZUEUgaHRtbD4KLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+ Ci18ICAgICB4bGluazpocmVmPSJmb28iCi18ICAgICB4bWw6bGFuZz0iZW4iCi18ICAgICA8c3Zn IHN2Zz4KLXwgICAgICAgPHN2ZyBnPgotfCAgICAgICAgIHhsaW5rIGhyZWY9ImZvbyIKLXwgICAg ICAgICB4bWwgbGFuZz0iZW4iCi18ICAgICAgICJiYXIiCiByZXNvdXJjZXMvdGVzdHMxMS5kYXQ6 CiA0CiA4CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9n CmluZGV4IDQ0ZTIyZDEwOTU2YzU3MWVhYTBiNTY3Y2ZiNjU1M2FkYjZkMWQyYjcuLjlmZTE5NTEy NTg4MWVkZmYxOWVhYWU0N2EzZDcyMjkyNjRlZDNhOWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hh bmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTAtMDct MTAgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhUTUxUcmVlQnVpbGRlciBuZWVkcyBhZGp1c3RG b3JlaWduQXR0cmlidXRlcyBzdXBwb3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00MjAyMgorCisgICAgICAgIFRvIGFkZCBhZGp1c3QgZm9yZWlnbiBh dHRyaWJ1dGVzIHN1cHBvcnQgSSBoYWQgdG8gYWRkIGFuCisgICAgICAgIEF0b21pY1N0cmluZyAo cHJlZml4ZWQgbmFtZSkgdG8gUXVhbGlmaWVkTmFtZSBoYXNoLiAgT25jZSBJIGhhZAorICAgICAg ICBkb25lIHRoYXQsIEkgZGVjaWRlZCBpdCB3b3VsZCBiZSBiZXN0IGZvciB0aGUgb3RoZXIgImFk anVzdCIgZnVuY3Rpb25zCisgICAgICAgIHRvIHNoYXJlIHRoZSBzYW1lIGhhc2ggbG9naWMsIHNv IEkgbW92ZWQgdGhlbSB0byB1c2luZyB0aGUgc2FtZQorICAgICAgICBBdG9taWNTdHJpbmcgLT4g UXVhbGlmaWVkTmFtZSBoYXNoIGFzIHdlbGwuCisKKyAgICAgICAgVGVzdGVkIGJ5IGh0bWw1bGli L3J1bm5lci5odG1sCisKKyAgICAgICAgKiBkb20vQXR0cmlidXRlLmg6CisgICAgICAgIChXZWJD b3JlOjpBdHRyaWJ1dGU6OnBhcnNlclNldE5hbWUpOgorICAgICAgICAqIGh0bWwvSFRNTFRyZWVC dWlsZGVyLmNwcDoKKwogMjAxMC0wNy0wOSAgVG9ueSBDaGFuZyAgPHRvbnlAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9qYW4gVmFmYWkuCmRpZmYgLS1naXQgYS9XZWJDb3Jl L2RvbS9BdHRyaWJ1dGUuaCBiL1dlYkNvcmUvZG9tL0F0dHJpYnV0ZS5oCmluZGV4IDY2ODAzOWRi NmU4MmMwNmU3ZTg2ZmQ2Y2U0MTkzMzlkY2U1YzM2N2EuLmNmODRhNmZkZDY1NjZlOGU0YWMyOGRh NDc1ZjA5NjdjNWJhZWVkZWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL0F0dHJpYnV0ZS5oCisr KyBiL1dlYkNvcmUvZG9tL0F0dHJpYnV0ZS5oCkBAIC03OCwxMyArNzgsMTAgQEAgcHVibGljOgog ICAgIHZvaWQgc2V0VmFsdWUoY29uc3QgQXRvbWljU3RyaW5nJiB2YWx1ZSkgeyBtX3ZhbHVlID0g dmFsdWU7IH0KICAgICB2b2lkIHNldFByZWZpeChjb25zdCBBdG9taWNTdHJpbmcmIHByZWZpeCkg eyBtX25hbWUuc2V0UHJlZml4KHByZWZpeCk7IH0KIAotICAgIC8vIE5vdGU6IFRoaXMgQVBJIGlz IG9ubHkgZm9yIEhUTUxUcmVlQnVpbGRlci4gIEl0IGlzIG5vdCBzYWZlIHRvIGNoYW5nZSB0aGUg bmFtZQotICAgIC8vIG9mIGFuIGF0dHJpYnV0ZSBvbmNlIHBhcnNlTWFwcGVkQXR0cmlidXRlcyBo YXMgYmVlbiBjYWxsZWQgYXMgRE9NIGVsZW1lbnRzCi0gICAgLy8gbWF5IHBsYWNlZCB0aGUgQXR0 cmlidXRlIGluIGEgaGFzaC4KLSAgICB2b2lkIHBhcnNlclNldExvY2FsTmFtZShjb25zdCBBdG9t aWNTdHJpbmcmIGxvY2FsTmFtZSkKLSAgICB7Ci0gICAgICAgIG1fbmFtZSA9IFF1YWxpZmllZE5h bWUobV9uYW1lLnByZWZpeCgpLCBsb2NhbE5hbWUsIG1fbmFtZS5uYW1lc3BhY2VVUkkoKSk7Ci0g ICAgfQorICAgIC8vIE5vdGU6IFRoaXMgQVBJIGlzIG9ubHkgZm9yIEhUTUxUcmVlQnVpbGRlci4g IEl0IGlzIG5vdCBzYWZlIHRvIGNoYW5nZSB0aGUKKyAgICAvLyBuYW1lIG9mIGFuIGF0dHJpYnV0 ZSBvbmNlIHBhcnNlTWFwcGVkQXR0cmlidXRlIGhhcyBiZWVuIGNhbGxlZCBhcyBET00KKyAgICAv LyBlbGVtZW50cyBtYXkgaGF2ZSBwbGFjZWQgdGhlIEF0dHJpYnV0ZSBpbiBhIGhhc2ggYnkgbmFt ZS4KKyAgICB2b2lkIHBhcnNlclNldE5hbWUoY29uc3QgUXVhbGlmaWVkTmFtZSYgbmFtZSkgeyBt X25hbWUgPSBuYW1lOyB9CiAKICAgICBib29sIGlzTWFwcGVkQXR0cmlidXRlKCkgeyByZXR1cm4g bV9pc01hcHBlZEF0dHJpYnV0ZTsgfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTFRy ZWVCdWlsZGVyLmNwcCBiL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwCmluZGV4IDEx MWRkODQxYzI1YTA0YjA0ZGZhMzAyODA2OTRhZDZmYWJmY2RmZjkuLjM2Yzc5YzliZmJjYWNlZGNh ZmM2YWQ3MmZiZjkwNmI1YTZmYjNmZWIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MVHJl ZUJ1aWxkZXIuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwCkBAIC01 MSw2ICs1MSw5IEBACiAjaW5jbHVkZSAiU2NyaXB0Q29udHJvbGxlci5oIgogI2luY2x1ZGUgIlNl dHRpbmdzLmgiCiAjaW5jbHVkZSAiVGV4dC5oIgorI2luY2x1ZGUgIlhMaW5rTmFtZXMuaCIKKyNp bmNsdWRlICJYTUxOU05hbWVzLmgiCisjaW5jbHVkZSAiWE1MTmFtZXMuaCIKICNpbmNsdWRlIDx3 dGYvVW51c2VkUGFyYW0uaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNjYwLDQ4ICs2NjMs MjAgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NDbG9zZVdoZW5OZXN0ZWRUYWcoQXRv bWljSFRNTFRva2VuJiB0b2tlbikKIAogbmFtZXNwYWNlIHsKIAotI2lmIEVOQUJMRShTVkcpCi0K LXR5cGVkZWYgSGFzaE1hcDxBdG9taWNTdHJpbmcsIEF0b21pY1N0cmluZz4gTmFtZUNhc2VNYXA7 Ci0KLXZvaWQgYWRkTmFtZShOYW1lQ2FzZU1hcCogbWFwLCBjb25zdCBRdWFsaWZpZWROYW1lJiBh dHRyaWJ1dGVOYW1lKQotewotICAgIG1hcC0+YWRkKGF0dHJpYnV0ZU5hbWUubG9jYWxOYW1lKCku bG93ZXIoKSwgYXR0cmlidXRlTmFtZS5sb2NhbE5hbWUoKSk7Ci19Cit0eXBlZGVmIEhhc2hNYXA8 QXRvbWljU3RyaW5nLCBRdWFsaWZpZWROYW1lPiBQcmVmaXhlZE5hbWVUb1F1YWxpZmllZE5hbWVN YXA7CiAKLU5hbWVDYXNlTWFwKiBjcmVhdGVDYXNlTWFwRm9yTmFtZXMoUXVhbGlmaWVkTmFtZSoq IG5hbWVzLCBzaXplX3QgbGVuZ3RoKQordm9pZCBtYXBMb3dlcmVkTG9jYWxOYW1lVG9OYW1lKFBy ZWZpeGVkTmFtZVRvUXVhbGlmaWVkTmFtZU1hcCogbWFwLCBRdWFsaWZpZWROYW1lKiogbmFtZXMs IHNpemVfdCBsZW5ndGgpCiB7Ci0gICAgTmFtZUNhc2VNYXAqIGNhc2VNYXAgPSBuZXcgTmFtZUNh c2VNYXA7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsZW5ndGg7ICsraSkgewotICAgICAg ICBRdWFsaWZpZWROYW1lKiBuYW1lID0gbmFtZXNbaV07Ci0gICAgICAgIGNvbnN0IEF0b21pY1N0 cmluZyYgbG9jYWxOYW1lID0gbmFtZS0+bG9jYWxOYW1lKCk7CisgICAgICAgIGNvbnN0IFF1YWxp ZmllZE5hbWUmIG5hbWUgPSAqbmFtZXNbaV07CisgICAgICAgIGNvbnN0IEF0b21pY1N0cmluZyYg bG9jYWxOYW1lID0gbmFtZS5sb2NhbE5hbWUoKTsKICAgICAgICAgQXRvbWljU3RyaW5nIGxvd2Vy ZWRMb2NhbE5hbWUgPSBsb2NhbE5hbWUubG93ZXIoKTsKICAgICAgICAgaWYgKGxvd2VyZWRMb2Nh bE5hbWUgIT0gbG9jYWxOYW1lKQotICAgICAgICAgICAgY2FzZU1hcC0+YWRkKGxvd2VyZWRMb2Nh bE5hbWUsIGxvY2FsTmFtZSk7CisgICAgICAgICAgICBtYXAtPmFkZChsb3dlcmVkTG9jYWxOYW1l LCBuYW1lKTsKICAgICB9Ci0gICAgcmV0dXJuIGNhc2VNYXA7CiB9CiAKLXZvaWQgYWRqdXN0U1ZH QXR0cmlidXRlcyhBdG9taWNIVE1MVG9rZW4mIHRva2VuKQotewotICAgIHN0YXRpYyBOYW1lQ2Fz ZU1hcCogY2FzZU1hcCA9IDA7Ci0gICAgaWYgKCFjYXNlTWFwKSB7Ci0gICAgICAgIHNpemVfdCBs ZW5ndGggPSAwOwotICAgICAgICBRdWFsaWZpZWROYW1lKiogc3ZnQXR0cnMgPSBTVkdOYW1lczo6 Z2V0U1ZHQXR0cnMoJmxlbmd0aCk7Ci0gICAgICAgIGNhc2VNYXAgPSBjcmVhdGVDYXNlTWFwRm9y TmFtZXMoc3ZnQXR0cnMsIGxlbmd0aCk7Ci0gICAgfQotCi0gICAgTmFtZWROb2RlTWFwKiBhdHRy aWJ1dGVzID0gdG9rZW4uYXR0cmlidXRlcygpOwotICAgIGlmICghYXR0cmlidXRlcykKLSAgICAg ICAgcmV0dXJuOwotCi0gICAgZm9yICh1bnNpZ25lZCB4ID0gMDsgeCA8IGF0dHJpYnV0ZXMtPmxl bmd0aCgpOyArK3gpIHsKLSAgICAgICAgQXR0cmlidXRlKiBhdHRyaWJ1dGUgPSBhdHRyaWJ1dGVz LT5hdHRyaWJ1dGVJdGVtKHgpOwotICAgICAgICBjb25zdCBBdG9taWNTdHJpbmcmIGNhc2VkTmFt ZSA9IGNhc2VNYXAtPmdldChhdHRyaWJ1dGUtPmxvY2FsTmFtZSgpKTsKLSAgICAgICAgaWYgKCFj YXNlZE5hbWUuaXNOdWxsKCkpCi0gICAgICAgICAgICBhdHRyaWJ1dGUtPnBhcnNlclNldExvY2Fs TmFtZShjYXNlZE5hbWUpOwotICAgIH0KLX0KKyNpZiBFTkFCTEUoU1ZHKQogCiAvLyBGSVhNRTog VGhpcyBpcyBhIGhhY2sgdW50aWwgd2UgY2FuIGZpeCBTVkdOYW1lcyB0byBhbHdheXMgZ2VuZXJh dGUgYWxsIG5hbWVzLgogUXVhbGlmaWVkTmFtZSBzdmdUYWdOYW1lRm9yKGNvbnN0IEF0b21pY1N0 cmluZyYgbG9jYWxOYW1lKQpAQCAtNzA5LDEzICs2ODQsMTkgQEAgUXVhbGlmaWVkTmFtZSBzdmdU YWdOYW1lRm9yKGNvbnN0IEF0b21pY1N0cmluZyYgbG9jYWxOYW1lKQogICAgIHJldHVybiBRdWFs aWZpZWROYW1lKG51bGxBdG9tLCBsb2NhbE5hbWUsIFNWR05hbWVzOjpzdmdOYW1lc3BhY2VVUkkp OwogfQogCit2b2lkIGFkZE5hbWUoUHJlZml4ZWROYW1lVG9RdWFsaWZpZWROYW1lTWFwKiBtYXAs IGNvbnN0IFF1YWxpZmllZE5hbWUmIG5hbWUpCit7CisgICAgbWFwLT5hZGQobmFtZS5sb2NhbE5h bWUoKS5sb3dlcigpLCBuYW1lKTsKK30KKwogdm9pZCBhZGp1c3RTVkdUYWdOYW1lQ2FzZShBdG9t aWNIVE1MVG9rZW4mIHRva2VuKQogewotICAgIHN0YXRpYyBOYW1lQ2FzZU1hcCogY2FzZU1hcCA9 IDA7CisgICAgc3RhdGljIFByZWZpeGVkTmFtZVRvUXVhbGlmaWVkTmFtZU1hcCogY2FzZU1hcCA9 IDA7CiAgICAgaWYgKCFjYXNlTWFwKSB7CisgICAgICAgIGNhc2VNYXAgPSBuZXcgUHJlZml4ZWRO YW1lVG9RdWFsaWZpZWROYW1lTWFwOwogICAgICAgICBzaXplX3QgbGVuZ3RoID0gMDsKICAgICAg ICAgUXVhbGlmaWVkTmFtZSoqIHN2Z1RhZ3MgPSBTVkdOYW1lczo6Z2V0U1ZHVGFncygmbGVuZ3Ro KTsKLSAgICAgICAgY2FzZU1hcCA9IGNyZWF0ZUNhc2VNYXBGb3JOYW1lcyhzdmdUYWdzLCBsZW5n dGgpOworICAgICAgICBtYXBMb3dlcmVkTG9jYWxOYW1lVG9OYW1lKGNhc2VNYXAsIHN2Z1RhZ3Ms IGxlbmd0aCk7CiAgICAgICAgIC8vIEZJWE1FOiBUaGlzIGlzIGEgaGFjayBhcm91bmQgdGhlIGZh Y3QgdGhhdCBTVkdOYW1lcyBkb2VzIG5vdAogICAgICAgICAvLyBjdXJyZW50bHkgaW5jbHVkZSBh bGwgdmFsdWVzIEhUTUw1IGV4cGVjdHMgaXQgdG8uCiAgICAgICAgIGFkZE5hbWUoY2FzZU1hcCwg c3ZnVGFnTmFtZUZvcigiYWx0R2x5cGhEZWYiKSk7CkBAIC03MjMsMTAgKzcwNCwzMiBAQCB2b2lk IGFkanVzdFNWR1RhZ05hbWVDYXNlKEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgICAgIGFk ZE5hbWUoY2FzZU1hcCwgc3ZnVGFnTmFtZUZvcigiZ2x5cGhSZWYiKSk7CiAgICAgfQogCi0gICAg Y29uc3QgQXRvbWljU3RyaW5nJiBjYXNlZE5hbWUgPSBjYXNlTWFwLT5nZXQodG9rZW4ubmFtZSgp KTsKLSAgICBpZiAoY2FzZWROYW1lLmlzTnVsbCgpKQorICAgIGNvbnN0IFF1YWxpZmllZE5hbWUm IGNhc2VkTmFtZSA9IGNhc2VNYXAtPmdldCh0b2tlbi5uYW1lKCkpOworICAgIGlmIChjYXNlZE5h bWUubG9jYWxOYW1lKCkuaXNOdWxsKCkpCisgICAgICAgIHJldHVybjsKKyAgICB0b2tlbi5zZXRO YW1lKGNhc2VkTmFtZS5sb2NhbE5hbWUoKSk7Cit9CisKK3ZvaWQgYWRqdXN0U1ZHQXR0cmlidXRl cyhBdG9taWNIVE1MVG9rZW4mIHRva2VuKQoreworICAgIHN0YXRpYyBQcmVmaXhlZE5hbWVUb1F1 YWxpZmllZE5hbWVNYXAqIGNhc2VNYXAgPSAwOworICAgIGlmICghY2FzZU1hcCkgeworICAgICAg ICBjYXNlTWFwID0gbmV3IFByZWZpeGVkTmFtZVRvUXVhbGlmaWVkTmFtZU1hcDsKKyAgICAgICAg c2l6ZV90IGxlbmd0aCA9IDA7CisgICAgICAgIFF1YWxpZmllZE5hbWUqKiBzdmdBdHRycyA9IFNW R05hbWVzOjpnZXRTVkdBdHRycygmbGVuZ3RoKTsKKyAgICAgICAgbWFwTG93ZXJlZExvY2FsTmFt ZVRvTmFtZShjYXNlTWFwLCBzdmdBdHRycywgbGVuZ3RoKTsKKyAgICB9CisKKyAgICBOYW1lZE5v ZGVNYXAqIGF0dHJpYnV0ZXMgPSB0b2tlbi5hdHRyaWJ1dGVzKCk7CisgICAgaWYgKCFhdHRyaWJ1 dGVzKQogICAgICAgICByZXR1cm47Ci0gICAgdG9rZW4uc2V0TmFtZShjYXNlZE5hbWUpOworCisg ICAgZm9yICh1bnNpZ25lZCB4ID0gMDsgeCA8IGF0dHJpYnV0ZXMtPmxlbmd0aCgpOyArK3gpIHsK KyAgICAgICAgQXR0cmlidXRlKiBhdHRyaWJ1dGUgPSBhdHRyaWJ1dGVzLT5hdHRyaWJ1dGVJdGVt KHgpOworICAgICAgICBjb25zdCBRdWFsaWZpZWROYW1lJiBjYXNlZE5hbWUgPSBjYXNlTWFwLT5n ZXQoYXR0cmlidXRlLT5sb2NhbE5hbWUoKSk7CisgICAgICAgIGlmICghY2FzZWROYW1lLmxvY2Fs TmFtZSgpLmlzTnVsbCgpKQorICAgICAgICAgICAgYXR0cmlidXRlLT5wYXJzZXJTZXROYW1lKGNh c2VkTmFtZSk7CisgICAgfQogfQogCiAjZW5kaWYKQEAgLTczOCw5ICs3NDEsNDMgQEAgdm9pZCBh ZGp1c3RNYXRoTUxBdHRyaWJ1dGVzKEF0b21pY0hUTUxUb2tlbiYpCiB9CiAjZW5kaWYKIAotdm9p ZCBhZGp1c3RGb3JlaWduQXR0cmlidXRlcyhBdG9taWNIVE1MVG9rZW4mKQordm9pZCBhZGROYW1l c1dpdGhQcmVmaXgoUHJlZml4ZWROYW1lVG9RdWFsaWZpZWROYW1lTWFwKiBtYXAsIGNvbnN0IEF0 b21pY1N0cmluZyYgcHJlZml4LCBRdWFsaWZpZWROYW1lKiogbmFtZXMsIHNpemVfdCBsZW5ndGgp CiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGxl bmd0aDsgKytpKSB7CisgICAgICAgIFF1YWxpZmllZE5hbWUqIG5hbWUgPSBuYW1lc1tpXTsKKyAg ICAgICAgY29uc3QgQXRvbWljU3RyaW5nJiBsb2NhbE5hbWUgPSBuYW1lLT5sb2NhbE5hbWUoKTsK KyAgICAgICAgQXRvbWljU3RyaW5nIHByZWZpeENvbG9uTG9jYWxOYW1lKHByZWZpeCArICI6IiAr IGxvY2FsTmFtZSk7CisgICAgICAgIFF1YWxpZmllZE5hbWUgbmFtZVdpdGhQcmVmaXgocHJlZml4 LCBsb2NhbE5hbWUsIG5hbWUtPm5hbWVzcGFjZVVSSSgpKTsKKyAgICAgICAgbWFwLT5hZGQocHJl Zml4Q29sb25Mb2NhbE5hbWUsIG5hbWVXaXRoUHJlZml4KTsKKyAgICB9Cit9CisKK3ZvaWQgYWRq dXN0Rm9yZWlnbkF0dHJpYnV0ZXMoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKK3sKKyAgICBzdGF0 aWMgUHJlZml4ZWROYW1lVG9RdWFsaWZpZWROYW1lTWFwKiBtYXAgPSAwOworICAgIGlmICghbWFw KSB7CisgICAgICAgIG1hcCA9IG5ldyBQcmVmaXhlZE5hbWVUb1F1YWxpZmllZE5hbWVNYXA7Cisg ICAgICAgIHNpemVfdCBsZW5ndGggPSAwOworICAgICAgICBRdWFsaWZpZWROYW1lKiogYXR0cnMg PSBYTGlua05hbWVzOjpnZXRYTGlua0F0dHJzKCZsZW5ndGgpOworICAgICAgICBhZGROYW1lc1dp dGhQcmVmaXgobWFwLCAieGxpbmsiLCBhdHRycywgbGVuZ3RoKTsKKworICAgICAgICBhdHRycyA9 IFhNTE5hbWVzOjpnZXRYTUxBdHRycygmbGVuZ3RoKTsKKyAgICAgICAgYWRkTmFtZXNXaXRoUHJl Zml4KG1hcCwgInhtbCIsIGF0dHJzLCBsZW5ndGgpOworCisgICAgICAgIG1hcC0+YWRkKCJ4bWxu cyIsIFhNTE5TTmFtZXM6OnhtbG5zQXR0cik7CisgICAgICAgIG1hcC0+YWRkKCJ4bWxuczp4bGlu ayIsIFF1YWxpZmllZE5hbWUoInhtbG5zIiwgInhsaW5rIiwgWE1MTlNOYW1lczo6eG1sbnNOYW1l c3BhY2VVUkkpKTsKKyAgICB9CisKKyAgICBOYW1lZE5vZGVNYXAqIGF0dHJpYnV0ZXMgPSB0b2tl bi5hdHRyaWJ1dGVzKCk7CisgICAgaWYgKCFhdHRyaWJ1dGVzKQorICAgICAgICByZXR1cm47CisK KyAgICBmb3IgKHVuc2lnbmVkIHggPSAwOyB4IDwgYXR0cmlidXRlcy0+bGVuZ3RoKCk7ICsreCkg eworICAgICAgICBBdHRyaWJ1dGUqIGF0dHJpYnV0ZSA9IGF0dHJpYnV0ZXMtPmF0dHJpYnV0ZUl0 ZW0oeCk7CisgICAgICAgIGNvbnN0IFF1YWxpZmllZE5hbWUmIG5hbWUgPSBtYXAtPmdldChhdHRy aWJ1dGUtPmxvY2FsTmFtZSgpKTsKKyAgICAgICAgaWYgKCFuYW1lLmxvY2FsTmFtZSgpLmlzTnVs bCgpKQorICAgICAgICAgICAgYXR0cmlidXRlLT5wYXJzZXJTZXROYW1lKG5hbWUpOworICAgIH0K IH0KIAogfQo=