42222 2010-07-13 18:15:30 -0700 reconstructActiveFormElements should reconstruct attributes as well 2010-07-14 11:50:30 -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 oldest_to_newest 250880 0 eric 2010-07-13 18:15:30 -0700 reconstructActiveFormElements should reconstruct attributes instead 250907 1 61453 eric 2010-07-13 18:47:37 -0700 Created attachment 61453 Patch 251249 2 61453 abarth 2010-07-14 09:58:44 -0700 Comment on attachment 61453 Patch LayoutTests/ChangeLog:5 + reconstructActiveFormElements should reconstruct attributes instead instead? LayoutTests/html5lib/resources/adoption01.dat:163 + | "document.getElementById("A").id = "B"" Nice test. Will this cause problems for us when we upstream these tests? We might want to separate tests that require scripts into their own dat file. WebCore/html/HTMLConstructionSite.cpp:303 + namespace { Please place this block at the top of the file. WebCore/html/HTMLConstructionSite.h:67 + // Used by the adoption agency. Please remove this comment. 251323 3 eric 2010-07-14 11:37:43 -0700 (In reply to comment #2) > (From update of attachment 61453 [details]) > LayoutTests/ChangeLog:5 > + reconstructActiveFormElements should reconstruct attributes instead > instead? Fixed. > LayoutTests/html5lib/resources/adoption01.dat:163 > + | "document.getElementById("A").id = "B"" > Nice test. Will this cause problems for us when we upstream these tests? We might want to separate tests that require scripts into their own dat file. I think we should do that when we understand the upstreaming requirements. > WebCore/html/HTMLConstructionSite.cpp:303 > + namespace { > Please place this block at the top of the file. Why? > WebCore/html/HTMLConstructionSite.h:67 > + // Used by the adoption agency. > Please remove this comment. OK. Fixed. 251336 4 eric 2010-07-14 11:50:30 -0700 Committed r63338: <http://trac.webkit.org/changeset/63338> 61453 2010-07-13 18:47:37 -0700 2010-07-14 09:58:44 -0700 Patch bug-42222-20100713184735.patch text/plain 17291 eric ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA5NjlhZjE2NmZiODZjM2M3YjgzNTI1YjExMzJhMjY2MjgyZWUyOGY4Li5kZTAzNGQ0 YTNmMDkyODBlMjdkODA3MmU3YzYxYjIzYjBkODY0NjlmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMTUgQEAK IAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICByZWNvbnN0 cnVjdEFjdGl2ZUZvcm1FbGVtZW50cyBzaG91bGQgcmVjb25zdHJ1Y3QgYXR0cmlidXRlcyBpbnN0 ZWFkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjIy MgorCisgICAgICAgICogaHRtbDVsaWIvcmVzb3VyY2VzL2Fkb3B0aW9uMDEuZGF0OgorCisyMDEw LTA3LTEzICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBGaXggbXkgbWlzcmVhZGluZyBvZiAiY2xl YXIgdG8gdGhlIGxhc3QgbWFya2VyIiBpbiB0aGUgSFRNTDUgc3BlYwogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDIxOTkKIApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvaHRtbDVsaWIvcmVzb3VyY2VzL2Fkb3B0aW9uMDEuZGF0IGIvTGF5b3V0VGVzdHMv aHRtbDVsaWIvcmVzb3VyY2VzL2Fkb3B0aW9uMDEuZGF0CmluZGV4IGY4MGM0YzYyYjA1ZTJiNDNi NTM0MzVhZWVhNDc2NTNmOWIwZThlMTEuLjAxZTc5NDgxMjMxZWVjMDBmMjM0MjkwZmY0OTc3Y2M0 NzA0ODI3NzkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0bWw1bGliL3Jlc291cmNlcy9hZG9w dGlvbjAxLmRhdAorKysgYi9MYXlvdXRUZXN0cy9odG1sNWxpYi9yZXNvdXJjZXMvYWRvcHRpb24w MS5kYXQKQEAgLTEyNCwzICsxMjQsNDMgQEAKIHwgICAgICAgPGI+CiB8ICAgICAgICAgPHA+CiB8 ICAgICAgICAgICA8YT4KKworI2RhdGEKKzxwPjE8cyBpZD0iQSI+MjxiIGlkPSJCIj4zPC9wPjQ8 L3M+NTwvYj4KKyNlcnJvcnMKKyNkb2N1bWVudAorfCA8aHRtbD4KK3wgICA8aGVhZD4KK3wgICA8 Ym9keT4KK3wgICAgIDxwPgorfCAgICAgICAiMSIKK3wgICAgICAgPHM+Cit8ICAgICAgICAgaWQ9 IkEiCit8ICAgICAgICAgIjIiCit8ICAgICAgICAgPGI+Cit8ICAgICAgICAgICBpZD0iQiIKK3wg ICAgICAgICAgICIzIgorfCAgICAgPHM+Cit8ICAgICAgIGlkPSJBIgorfCAgICAgICA8Yj4KK3wg ICAgICAgICBpZD0iQiIKK3wgICAgICAgICAiNCIKK3wgICAgIDxiPgorfCAgICAgICBpZD0iQiIK K3wgICAgICAgIjUiCisKKyNkYXRhCis8cD48YiBpZD0iQSI+PHNjcmlwdD5kb2N1bWVudC5nZXRF bGVtZW50QnlJZCgiQSIpLmlkID0gIkIiPC9zY3JpcHQ+PC9wPlRFWFQ8L2I+CisjZXJyb3JzCisj ZG9jdW1lbnQKK3wgPGh0bWw+Cit8ICAgPGhlYWQ+Cit8ICAgPGJvZHk+Cit8ICAgICA8cD4KK3wg ICAgICAgPGI+Cit8ICAgICAgICAgaWQ9IkIiCit8ICAgICAgICAgPHNjcmlwdD4KK3wgICAgICAg ICAgICJkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiQSIpLmlkID0gIkIiIgorfCAgICAgPGI+Cit8 ICAgICAgIGlkPSJBIgorfCAgICAgICAiVEVYVCIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0 bWw1bGliL3J1bm5lci1leHBlY3RlZC1odG1sNS50eHQgYi9MYXlvdXRUZXN0cy9odG1sNWxpYi9y dW5uZXItZXhwZWN0ZWQtaHRtbDUudHh0CmluZGV4IDRlZGU5Y2RkNmI0NGQwZWM2MzkxYzM3MTdk MjZiMmE2YzEzNmJkYjUuLmZkNmVhYjIwM2Y2MjUyYjhlNWE3ZWQwNjE2NjdhMzk2NmZiNmRmZTgg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0bWw1bGliL3J1bm5lci1leHBlY3RlZC1odG1sNS50 eHQKKysrIGIvTGF5b3V0VGVzdHMvaHRtbDVsaWIvcnVubmVyLWV4cGVjdGVkLWh0bWw1LnR4dApA QCAtMjMsMTIgKzIzLDE0IEBAIEdvdDoKIHwgICAgICAgICBocmVmPSJmb28iCiB8ICAgICAgICAg ImJyIgogfCAgICAgICA8YT4KK3wgICAgICAgICBocmVmPSJmb28iCiB8ICAgICAgICJ4IgogfCAg ICAgICA8dGFibGU+CiB8ICAgICAgICAgPHRib2R5PgogfCAgICAgICAgICAgPHRyPgogfCAgICAg ICAgICAgICA8dGQ+CiB8ICAgICA8YT4KK3wgICAgICAgaHJlZj0iZm9vIgogfCAgICAgICAiYW9l IgogRXhwZWN0ZWQ6CiB8IDxodG1sPgpAQCAtNjEsNiArNjMsNyBAQCBHb3Q6CiB8ICAgICAgIGhy ZWY9ImJsYWgiCiB8ICAgICAgICJhYmEiCiB8ICAgICA8YT4KK3wgICAgICAgaHJlZj0iYmxhaCIK IHwgICAgICJ4IgogfCAgICAgPHRhYmxlPgogfCAgICAgICA8dGJvZHk+CkBAIC03MCw2ICs3Myw3 IEBAIEdvdDoKIHwgICAgICAgICAgICAgICBocmVmPSJmb28iCiB8ICAgICAgICAgICAgICAgImJy IgogfCAgICAgPGE+Cit8ICAgICAgIGhyZWY9ImJsYWgiCiB8ICAgICAgICJhb2UiCiBFeHBlY3Rl ZDoKIHwgPGh0bWw+CkBAIC0zMjIsOCArMzI2LDkgQEAgcmVzb3VyY2VzL2NvbW1lbnRzMDEuZGF0 OiBQQVNTCiAKIHJlc291cmNlcy9hZG9wdGlvbjAxLmRhdDoKIDMKKzExCiAKLVRlc3QgMyBvZiA5 IGluIHJlc291cmNlcy9hZG9wdGlvbjAxLmRhdCBmYWlsZWQuIElucHV0OgorVGVzdCAzIG9mIDEx IGluIHJlc291cmNlcy9hZG9wdGlvbjAxLmRhdCBmYWlsZWQuIElucHV0OgogPGE+MTxidXR0b24+ MjwvYT4zPC9idXR0b24+CiBHb3Q6CiB8IDxodG1sPgpAQCAtMzQyLDYgKzM0NywzMyBAQCBFeHBl Y3RlZDoKIHwgICAgICAgPGJ1dHRvbj4KIHwgICAgICAgICAiMiIKIHwgICAgICIzIgorCitUZXN0 IDExIG9mIDExIGluIHJlc291cmNlcy9hZG9wdGlvbjAxLmRhdCBmYWlsZWQuIElucHV0OgorPHA+ PGIgaWQ9IkEiPjxzY3JpcHQ+ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIkEiKS5pZCA9ICJCIjwv c2NyaXB0PjwvcD5URVhUPC9iPgorR290OgorfCA8aHRtbD4KK3wgICA8aGVhZD4KK3wgICA8Ym9k eT4KK3wgICAgIDxwPgorfCAgICAgICA8Yj4KK3wgICAgICAgICBpZD0iQiIKK3wgICAgICAgICA8 c2NyaXB0PgorfCAgICAgICAgICAgImRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJBIikuaWQgPSAi QiIiCit8ICAgICA8Yj4KK3wgICAgICAgaWQ9IkIiCit8ICAgICAgICJURVhUIgorRXhwZWN0ZWQ6 Cit8IDxodG1sPgorfCAgIDxoZWFkPgorfCAgIDxib2R5PgorfCAgICAgPHA+Cit8ICAgICAgIDxi PgorfCAgICAgICAgIGlkPSJCIgorfCAgICAgICAgIDxzY3JpcHQ+Cit8ICAgICAgICAgICAiZG9j dW1lbnQuZ2V0RWxlbWVudEJ5SWQoIkEiKS5pZCA9ICJCIiIKK3wgICAgIDxiPgorfCAgICAgICBp ZD0iQSIKK3wgICAgICAgIlRFWFQiCiByZXNvdXJjZXMvaW5ib2R5MDEuZGF0OiBQQVNTCiAKIHJl c291cmNlcy9pc2luZGV4LmRhdDogUEFTUwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHRtbDVs aWIvcnVubmVyLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0bWw1bGliL3J1bm5lci1leHBl Y3RlZC50eHQKaW5kZXggY2U5ODk5ZTE4OThiZmNmYTJlMzcyOGI0Y2MzNTJjNTBkYTMwZDNhMi4u ZmYxZDhlZDUzNTFkZjA1ZTFmYTMwMWY1MWJhNTVhY2Y3N2MzNmE3ZSAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvaHRtbDVsaWIvcnVubmVyLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9o dG1sNWxpYi9ydW5uZXItZXhwZWN0ZWQudHh0CkBAIC01MDAzLDggKzUwMDMsOSBAQCByZXNvdXJj ZXMvYWRvcHRpb24wMS5kYXQ6CiA3CiA4CiA5CisxMQogCi1UZXN0IDEgb2YgOSBpbiByZXNvdXJj ZXMvYWRvcHRpb24wMS5kYXQgZmFpbGVkLiBJbnB1dDoKK1Rlc3QgMSBvZiAxMSBpbiByZXNvdXJj ZXMvYWRvcHRpb24wMS5kYXQgZmFpbGVkLiBJbnB1dDoKIDxhPjxwPjwvYT48L3A+CiBHb3Q6CiB8 IDxodG1sPgpAQCAtNTAyMCw3ICs1MDIxLDcgQEAgRXhwZWN0ZWQ6CiB8ICAgICA8cD4KIHwgICAg ICAgPGE+CiAKLVRlc3QgNiBvZiA5IGluIHJlc291cmNlcy9hZG9wdGlvbjAxLmRhdCBmYWlsZWQu IElucHV0OgorVGVzdCA2IG9mIDExIGluIHJlc291cmNlcy9hZG9wdGlvbjAxLmRhdCBmYWlsZWQu IElucHV0OgogPHRhYmxlPjxhPjE8cD4yPC9hPjM8L3A+CiBHb3Q6CiB8IDxodG1sPgpAQCAtNTA0 NSw3ICs1MDQ2LDcgQEAgRXhwZWN0ZWQ6CiB8ICAgICAgICIzIgogfCAgICAgPHRhYmxlPgogCi1U ZXN0IDcgb2YgOSBpbiByZXNvdXJjZXMvYWRvcHRpb24wMS5kYXQgZmFpbGVkLiBJbnB1dDoKK1Rl c3QgNyBvZiAxMSBpbiByZXNvdXJjZXMvYWRvcHRpb24wMS5kYXQgZmFpbGVkLiBJbnB1dDoKIDxi PjxiPjxhPjxwPjwvYT4KIEdvdDoKIHwgPGh0bWw+CkBAIC01MDY1LDcgKzUwNjYsNyBAQCBFeHBl Y3RlZDoKIHwgICAgICAgICA8cD4KIHwgICAgICAgICAgIDxhPgogCi1UZXN0IDggb2YgOSBpbiBy ZXNvdXJjZXMvYWRvcHRpb24wMS5kYXQgZmFpbGVkLiBJbnB1dDoKK1Rlc3QgOCBvZiAxMSBpbiBy ZXNvdXJjZXMvYWRvcHRpb24wMS5kYXQgZmFpbGVkLiBJbnB1dDoKIDxiPjxhPjxiPjxwPjwvYT4K IEdvdDoKIHwgPGh0bWw+CkBAIC01MDg3LDcgKzUwODgsNyBAQCBFeHBlY3RlZDoKIHwgICAgICAg ICA8cD4KIHwgICAgICAgICAgIDxhPgogCi1UZXN0IDkgb2YgOSBpbiByZXNvdXJjZXMvYWRvcHRp b24wMS5kYXQgZmFpbGVkLiBJbnB1dDoKK1Rlc3QgOSBvZiAxMSBpbiByZXNvdXJjZXMvYWRvcHRp b24wMS5kYXQgZmFpbGVkLiBJbnB1dDoKIDxhPjxiPjxiPjxwPjwvYT4KIEdvdDoKIHwgPGh0bWw+ CkBAIC01MTEwLDYgKzUxMTEsMzMgQEAgRXhwZWN0ZWQ6CiB8ICAgICAgIDxiPgogfCAgICAgICAg IDxwPgogfCAgICAgICAgICAgPGE+CisKK1Rlc3QgMTEgb2YgMTEgaW4gcmVzb3VyY2VzL2Fkb3B0 aW9uMDEuZGF0IGZhaWxlZC4gSW5wdXQ6Cis8cD48YiBpZD0iQSI+PHNjcmlwdD5kb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgiQSIpLmlkID0gIkIiPC9zY3JpcHQ+PC9wPlRFWFQ8L2I+CitHb3Q6Cit8 IDxodG1sPgorfCAgIDxoZWFkPgorfCAgIDxib2R5PgorfCAgICAgPHA+Cit8ICAgICAgIDxiPgor fCAgICAgICAgIGlkPSJCIgorfCAgICAgICAgIDxzY3JpcHQ+Cit8ICAgICAgICAgICAiZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoIkEiKS5pZCA9ICJCIiIKK3wgICAgIDxiPgorfCAgICAgICBpZD0i QiIKK3wgICAgICAgIlRFWFQiCitFeHBlY3RlZDoKK3wgPGh0bWw+Cit8ICAgPGhlYWQ+Cit8ICAg PGJvZHk+Cit8ICAgICA8cD4KK3wgICAgICAgPGI+Cit8ICAgICAgICAgaWQ9IkIiCit8ICAgICAg ICAgPHNjcmlwdD4KK3wgICAgICAgICAgICJkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiQSIpLmlk ID0gIkIiIgorfCAgICAgPGI+Cit8ICAgICAgIGlkPSJBIgorfCAgICAgICAiVEVYVCIKIHJlc291 cmNlcy9pbmJvZHkwMS5kYXQ6IFBBU1MKIAogcmVzb3VyY2VzL2lzaW5kZXguZGF0OgpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAyMGJmODY2 OTc1MGZhYjQ4YWI2NTA1OThlOTZjODg0MTQ1NzM3ZGU3Li4wNzhmMDY4NWIyMmQ3ZTQ0Njc5OTZm Mjc0M2JjYjMyMGVjMDcxOTFiIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMiw2ICsyLDQ4IEBACiAKICAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCiAKKyAgICAgICAgcmVjb25zdHJ1Y3RBY3RpdmVGb3JtRWxlbWVudHMg c2hvdWxkIHJlY29uc3RydWN0IGF0dHJpYnV0ZXMgaW5zdGVhZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDIyMjIKKworICAgICAgICBUaGUgY2FzZSBp biBxdWVzdGlvbiBpcyAiPHA+PGIgZm9vPSdiYXInPjwvcD50ZXh0PC9iPiIuCisgICAgICAgIFdo ZW4gdGhlICJiIiBpcyByZS1vcGVuZWQgdG8gd3JhcCB0aGUgdGV4dCBpdCBzaG91bGQgaW5jbHVk ZQorICAgICAgICBhbnkgYXR0cmlidXRlcyBmcm9tIHRoZSBvcmlnaW5hbCAobm93IGNsb3NlZCkg dGFnIG5hbWUuCisKKyAgICAgICAgVGhlcmUgYXJlIGFsc28gc2ltaWxhciBjYXNlcyBmb3IgdGhl IEFkb3B0aW9uIEFnZW5jeSBhbGdvcml0aG0sIGJ1dCBzaW5jZQorICAgICAgICB0aGUgaHRtbDVs aWIgdGVzdCBzdWl0ZSBkaWQgbm90IGNvdmVyIHRob3NlIChhbmQgaXQgd2Fzbid0IGltbWVkaWF0 ZWx5CisgICAgICAgIG9idmlvdXMgdG8gbWUgaG93IHRvIHRlc3QgdGhvc2UpIEkndmUgc2F2ZWQg Zml4aW5nIHRoYXQgYnVnIGZvciBhCisgICAgICAgIGxhdGVyIHBhdGNoLiAgRm9yIG5vdyBJJ3Zl IGp1c3QgbWFkZSB0aGUgYWRvcHRpb24gYWdlbmN5IHVzZQorICAgICAgICBIVE1MQ29uc3RydWN0 aW9uU2l0ZTo6Y3JlYXRlSFRNTEVsZW1lbnRGcm9tRWxlbWVudFJlY29yZCBzbyB0aGUKKyAgICAg ICAgRklYTUUgY2FuIGJlIGluIG9uZSBwbGFjZSBpbnN0ZWFkIG9mIHR3by4KKworICAgICAgICBJ biBvcmRlciB0byBjbGVhbmx5IHN1cHBvcnQgY3JlYXRlSFRNTEVsZW1lbnRGcm9tU2F2ZWRFbGVt ZW50CisgICAgICAgIEkgcmUtZmFjdG9yZWQgImF0dGFjaFRvQ3VycmVudCIgb3V0IGZyb20gY3Jl YXRlSFRNTEVsZW1lbnRBbmRBdHRhY2hUb0N1cnJlbnQKKyAgICAgICAgYW5kIGNoYW5nZWQgYWxs IGNhbGxlcnMgdG8gdXNlIGF0dGFjaFRvQ3VycmVudChjcmVhdGVIVE1MRWxlbWVudCh0b2tlbikp LgorCisgICAgICAgIFRoaXMgaXMgY292ZXJlZCBieSB0d28gZXhpc3RpbmcgdGVzdHMgaW4gaHRt bDVsaWIvcnVubmVyLmh0bWwKKyAgICAgICAgYW5kIEkgd3JvdGUgdHdvIG1vcmUuICBPbmUgdG8g Y292ZXIgdGhlIGJhc2ljIGNhc2UgdGhhdCB3ZSBub3cgcGFzcworICAgICAgICBhbmQgYSBzZWNv bmQgdG8gY292ZXIgYW4gZXZpbCBlZGdlIGNhc2Ugd2hpY2ggd2UgZG8gbm90LgorCisgICAgICAg ICogaHRtbC9IVE1MQ29uc3RydWN0aW9uU2l0ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1M Q29uc3RydWN0aW9uU2l0ZTo6YXR0YWNoVG9DdXJyZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxDb25zdHJ1Y3Rpb25TaXRlOjppbnNlcnRIVE1MSHRtbEVsZW1lbnQpOgorICAgICAgICAoV2Vi Q29yZTo6SFRNTENvbnN0cnVjdGlvblNpdGU6Omluc2VydEhUTUxIZWFkRWxlbWVudCk6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MQ29uc3RydWN0aW9uU2l0ZTo6aW5zZXJ0SFRNTEJvZHlFbGVtZW50 KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxDb25zdHJ1Y3Rpb25TaXRlOjppbnNlcnRIVE1MRWxl bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQ29uc3RydWN0aW9uU2l0ZTo6aW5zZXJ0U2Vs ZkNsb3NpbmdIVE1MRWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQ29uc3RydWN0aW9u U2l0ZTo6aW5zZXJ0U2NyaXB0RWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQ29uc3Ry dWN0aW9uU2l0ZTo6aW5zZXJ0Rm9yZWlnbkVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6SFRN TENvbnN0cnVjdGlvblNpdGU6OmNyZWF0ZUhUTUxFbGVtZW50RnJvbUVsZW1lbnRSZWNvcmQpOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTENvbnN0cnVjdGlvblNpdGU6OmNyZWF0ZUhUTUxFbGVtZW50 RnJvbVNhdmVkRWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQ29uc3RydWN0aW9uU2l0 ZTo6cmVjb25zdHJ1Y3RUaGVBY3RpdmVGb3JtYXR0aW5nRWxlbWVudHMpOgorICAgICAgICAqIGh0 bWwvSFRNTENvbnN0cnVjdGlvblNpdGUuaDoKKyAgICAgICAgKiBodG1sL0hUTUxUcmVlQnVpbGRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OmNhbGxUaGVBZG9wdGlv bkFnZW5jeSk6CisKKzIwMTAtMDctMTMgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCiAgICAgICAgIEZpeCBteSBt aXNyZWFkaW5nIG9mICJjbGVhciB0byB0aGUgbGFzdCBtYXJrZXIiIGluIHRoZSBIVE1MNSBzcGVj CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjE5OQog CmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTENvbnN0cnVjdGlvblNpdGUuY3BwIGIvV2Vi Q29yZS9odG1sL0hUTUxDb25zdHJ1Y3Rpb25TaXRlLmNwcAppbmRleCA1NzQ1NjI1ZjRhN2Y5MmQ2 Njc2ODgwY2VjNTNhNTc3Y2E5NGJjNWYzLi4xZTJkNzVmZTI4YTgyMTQzYWRiMzY0NzQ4ODg2ZTJk NWQzNDAyZWQyIDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRNTENvbnN0cnVjdGlvblNpdGUu Y3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MQ29uc3RydWN0aW9uU2l0ZS5jcHAKQEAgLTE5Myw0 MCArMTkzLDM5IEBAIHZvaWQgSFRNTENvbnN0cnVjdGlvblNpdGU6Omluc2VydENvbW1lbnRPbkhU TUxIdG1sRWxlbWVudChBdG9taWNIVE1MVG9rZW4mIHRva2VuCiAgICAgYXR0YWNoKG1fb3BlbkVs ZW1lbnRzLmh0bWxFbGVtZW50KCksIENvbW1lbnQ6OmNyZWF0ZShtX2RvY3VtZW50LCB0b2tlbi5j b21tZW50KCkpKTsKIH0KIAotUGFzc1JlZlB0cjxFbGVtZW50PiBIVE1MQ29uc3RydWN0aW9uU2l0 ZTo6Y3JlYXRlSFRNTEVsZW1lbnRBbmRBdHRhY2hUb0N1cnJlbnQoQXRvbWljSFRNTFRva2VuJiB0 b2tlbikKK1Bhc3NSZWZQdHI8RWxlbWVudD4gSFRNTENvbnN0cnVjdGlvblNpdGU6OmF0dGFjaFRv Q3VycmVudChQYXNzUmVmUHRyPEVsZW1lbnQ+IGNoaWxkKQogewotICAgIEFTU0VSVCh0b2tlbi50 eXBlKCkgPT0gSFRNTFRva2VuOjpTdGFydFRhZyk7Ci0gICAgcmV0dXJuIGF0dGFjaChjdXJyZW50 RWxlbWVudCgpLCBjcmVhdGVIVE1MRWxlbWVudCh0b2tlbikpOworICAgIHJldHVybiBhdHRhY2go Y3VycmVudEVsZW1lbnQoKSwgY2hpbGQpOwogfQogCiB2b2lkIEhUTUxDb25zdHJ1Y3Rpb25TaXRl OjppbnNlcnRIVE1MSHRtbEVsZW1lbnQoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKIHsKICAgICBB U1NFUlQoIW1fcmVkaXJlY3RBdHRhY2hUb0Zvc3RlclBhcmVudCk7Ci0gICAgbV9vcGVuRWxlbWVu dHMucHVzaEhUTUxIdG1sRWxlbWVudChjcmVhdGVIVE1MRWxlbWVudEFuZEF0dGFjaFRvQ3VycmVu dCh0b2tlbikpOworICAgIG1fb3BlbkVsZW1lbnRzLnB1c2hIVE1MSHRtbEVsZW1lbnQoYXR0YWNo VG9DdXJyZW50KGNyZWF0ZUhUTUxFbGVtZW50KHRva2VuKSkpOwogfQogCiB2b2lkIEhUTUxDb25z dHJ1Y3Rpb25TaXRlOjppbnNlcnRIVE1MSGVhZEVsZW1lbnQoQXRvbWljSFRNTFRva2VuJiB0b2tl bikKIHsKICAgICBBU1NFUlQoIW1fcmVkaXJlY3RBdHRhY2hUb0Zvc3RlclBhcmVudCk7Ci0gICAg bV9oZWFkID0gY3JlYXRlSFRNTEVsZW1lbnRBbmRBdHRhY2hUb0N1cnJlbnQodG9rZW4pOworICAg IG1faGVhZCA9IGF0dGFjaFRvQ3VycmVudChjcmVhdGVIVE1MRWxlbWVudCh0b2tlbikpOwogICAg IG1fb3BlbkVsZW1lbnRzLnB1c2hIVE1MSGVhZEVsZW1lbnQobV9oZWFkKTsKIH0KIAogdm9pZCBI VE1MQ29uc3RydWN0aW9uU2l0ZTo6aW5zZXJ0SFRNTEJvZHlFbGVtZW50KEF0b21pY0hUTUxUb2tl biYgdG9rZW4pCiB7CiAgICAgQVNTRVJUKCFtX3JlZGlyZWN0QXR0YWNoVG9Gb3N0ZXJQYXJlbnQp OwotICAgIG1fb3BlbkVsZW1lbnRzLnB1c2hIVE1MQm9keUVsZW1lbnQoY3JlYXRlSFRNTEVsZW1l bnRBbmRBdHRhY2hUb0N1cnJlbnQodG9rZW4pKTsKKyAgICBtX29wZW5FbGVtZW50cy5wdXNoSFRN TEJvZHlFbGVtZW50KGF0dGFjaFRvQ3VycmVudChjcmVhdGVIVE1MRWxlbWVudCh0b2tlbikpKTsK IH0KIAogdm9pZCBIVE1MQ29uc3RydWN0aW9uU2l0ZTo6aW5zZXJ0SFRNTEVsZW1lbnQoQXRvbWlj SFRNTFRva2VuJiB0b2tlbikKIHsKLSAgICBtX29wZW5FbGVtZW50cy5wdXNoKGNyZWF0ZUhUTUxF bGVtZW50QW5kQXR0YWNoVG9DdXJyZW50KHRva2VuKSk7CisgICAgbV9vcGVuRWxlbWVudHMucHVz aChhdHRhY2hUb0N1cnJlbnQoY3JlYXRlSFRNTEVsZW1lbnQodG9rZW4pKSk7CiB9CiAKIHZvaWQg SFRNTENvbnN0cnVjdGlvblNpdGU6Omluc2VydFNlbGZDbG9zaW5nSFRNTEVsZW1lbnQoQXRvbWlj SFRNTFRva2VuJiB0b2tlbikKIHsKICAgICBBU1NFUlQodG9rZW4udHlwZSgpID09IEhUTUxUb2tl bjo6U3RhcnRUYWcpOwotICAgIGNyZWF0ZUhUTUxFbGVtZW50QW5kQXR0YWNoVG9DdXJyZW50KHRv a2VuKTsKKyAgICBhdHRhY2hUb0N1cnJlbnQoY3JlYXRlSFRNTEVsZW1lbnQodG9rZW4pKTsKICAg ICAvLyBGSVhNRTogRG8gd2Ugd2FudCB0byBhY2tub3dsZWRnZSB0aGUgdG9rZW4ncyBzZWxmLWNs b3NpbmcgZmxhZz8KICAgICAvLyBodHRwOi8vd3d3LndoYXR3Zy5vcmcvc3BlY3Mvd2ViLWFwcHMv Y3VycmVudC13b3JrL211bHRpcGFnZS90b2tlbml6YXRpb24uaHRtbCNhY2tub3dsZWRnZS1zZWxm LWNsb3NpbmctZmxhZwogfQpAQCAtMjQ0LDcgKzI0Myw3IEBAIHZvaWQgSFRNTENvbnN0cnVjdGlv blNpdGU6Omluc2VydFNjcmlwdEVsZW1lbnQoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKIHsKICAg ICBSZWZQdHI8SFRNTFNjcmlwdEVsZW1lbnQ+IGVsZW1lbnQgPSBIVE1MU2NyaXB0RWxlbWVudDo6 Y3JlYXRlKHNjcmlwdFRhZywgbV9kb2N1bWVudCwgdHJ1ZSk7CiAgICAgZWxlbWVudC0+c2V0QXR0 cmlidXRlTWFwKHRva2VuLnRha2VBdHJpYnV0ZXMoKSwgbV9mcmFnbWVudFNjcmlwdGluZ1Blcm1p c3Npb24pOwotICAgIG1fb3BlbkVsZW1lbnRzLnB1c2goYXR0YWNoKGN1cnJlbnRFbGVtZW50KCks IGVsZW1lbnQucmVsZWFzZSgpKSk7CisgICAgbV9vcGVuRWxlbWVudHMucHVzaChhdHRhY2hUb0N1 cnJlbnQoZWxlbWVudC5yZWxlYXNlKCkpKTsKIH0KIAogdm9pZCBIVE1MQ29uc3RydWN0aW9uU2l0 ZTo6aW5zZXJ0Rm9yZWlnbkVsZW1lbnQoQXRvbWljSFRNTFRva2VuJiB0b2tlbiwgY29uc3QgQXRv bWljU3RyaW5nJiBuYW1lc3BhY2VVUkkpCkBAIC0yNTIsNyArMjUxLDcgQEAgdm9pZCBIVE1MQ29u c3RydWN0aW9uU2l0ZTo6aW5zZXJ0Rm9yZWlnbkVsZW1lbnQoQXRvbWljSFRNTFRva2VuJiB0b2tl biwgY29uc3QgQXQKICAgICBBU1NFUlQodG9rZW4udHlwZSgpID09IEhUTUxUb2tlbjo6U3RhcnRU YWcpOwogICAgIG5vdEltcGxlbWVudGVkKCk7IC8vIHBhcnNlRXJyb3Igd2hlbiB4bWxucyBvciB4 bWxuczp4bGluayBhcmUgd3JvbmcuCiAKLSAgICBSZWZQdHI8RWxlbWVudD4gZWxlbWVudCA9IGF0 dGFjaChjdXJyZW50RWxlbWVudCgpLCBjcmVhdGVFbGVtZW50KHRva2VuLCBuYW1lc3BhY2VVUkkp KTsKKyAgICBSZWZQdHI8RWxlbWVudD4gZWxlbWVudCA9IGF0dGFjaFRvQ3VycmVudChjcmVhdGVF bGVtZW50KHRva2VuLCBuYW1lc3BhY2VVUkkpKTsKICAgICBpZiAoIXRva2VuLnNlbGZDbG9zaW5n KCkpCiAgICAgICAgIG1fb3BlbkVsZW1lbnRzLnB1c2goZWxlbWVudCk7CiB9CkBAIC0yOTIsNiAr MjkxLDQ4IEBAIFBhc3NSZWZQdHI8RWxlbWVudD4gSFRNTENvbnN0cnVjdGlvblNpdGU6OmNyZWF0 ZUhUTUxFbGVtZW50KEF0b21pY0hUTUxUb2tlbiYgdG9rCiAgICAgcmV0dXJuIGVsZW1lbnQucmVs ZWFzZSgpOwogfQogCitQYXNzUmVmUHRyPEVsZW1lbnQ+IEhUTUxDb25zdHJ1Y3Rpb25TaXRlOjpj cmVhdGVIVE1MRWxlbWVudEZyb21FbGVtZW50UmVjb3JkKEhUTUxFbGVtZW50U3RhY2s6OkVsZW1l bnRSZWNvcmQqIHJlY29yZCkKK3sKKyAgICAvLyBGSVhNRTogVGhpcyB3aWxsIGNoYW5nZSB0byB1 c2UKKyAgICAvLyByZXR1cm4gY3JlYXRlSFRNTEVsZW1lbnRGcm9tU2F2ZWRFbGVtZW50KHJlY29y ZC0+ZWxlbWVudCgpKTsKKyAgICAvLyBpbiBhIGxhdGVyIHBhdGNoIG9uY2UgdGVzdGVkLgorICAg IEF0b21pY0hUTUxUb2tlbiBmYWtlVG9rZW4oSFRNTFRva2VuOjpTdGFydFRhZywgcmVjb3JkLT5l bGVtZW50KCktPmxvY2FsTmFtZSgpKTsKKyAgICByZXR1cm4gY3JlYXRlSFRNTEVsZW1lbnQoZmFr ZVRva2VuKTsKK30KKworbmFtZXNwYWNlIHsKKworUGFzc1JlZlB0cjxOYW1lZE5vZGVNYXA+IGNs b25lQXR0cmlidXRlcyhFbGVtZW50KiBlbGVtZW50KQoreworICAgIE5hbWVkTm9kZU1hcCogYXR0 cmlidXRlcyA9IGVsZW1lbnQtPmF0dHJpYnV0ZXModHJ1ZSk7CisgICAgaWYgKCFhdHRyaWJ1dGVz KQorICAgICAgICByZXR1cm4gMDsKKworICAgIFJlZlB0cjxOYW1lZE5vZGVNYXA+IG5ld0F0dHJp YnV0ZXMgPSBOYW1lZE5vZGVNYXA6OmNyZWF0ZSgpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBp IDwgYXR0cmlidXRlcy0+bGVuZ3RoKCk7ICsraSkgeworICAgICAgICBBdHRyaWJ1dGUqIGF0dHJp YnV0ZSA9IGF0dHJpYnV0ZXMtPmF0dHJpYnV0ZUl0ZW0oaSk7CisgICAgICAgIFJlZlB0cjxBdHRy aWJ1dGU+IGNsb25lID0gQXR0cmlidXRlOjpjcmVhdGVNYXBwZWQoYXR0cmlidXRlLT5uYW1lKCks IGF0dHJpYnV0ZS0+dmFsdWUoKSk7CisgICAgICAgIG5ld0F0dHJpYnV0ZXMtPmFkZEF0dHJpYnV0 ZShjbG9uZSk7CisgICAgfQorICAgIHJldHVybiBuZXdBdHRyaWJ1dGVzLnJlbGVhc2UoKTsKK30K KworfQorCitQYXNzUmVmUHRyPEVsZW1lbnQ+IEhUTUxDb25zdHJ1Y3Rpb25TaXRlOjpjcmVhdGVI VE1MRWxlbWVudEZyb21TYXZlZEVsZW1lbnQoRWxlbWVudCogZWxlbWVudCkKK3sKKyAgICAvLyBG SVhNRTogVGhpcyBtZXRob2QgaXMgd3JvbmcuICBXZSBzaG91bGQgYmUgdXNpbmcgdGhlIG9yaWdp bmFsIHRva2VuLgorICAgIC8vIFVzaW5nIGFuIEVsZW1lbnQqIGNhdXNlcyB1cyB0byBmYWlsIGV4 YW1wbGVzIGxpa2UgdGhpczoKKyAgICAvLyA8YiBpZD0iMSI+PHA+PHNjcmlwdD5kb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgiMSIpLmlkID0gIjIiPC9zY3JpcHQ+PC9wPlRFWFQ8L2I+CisgICAgLy8g V2hlbiByZWNvbnN0cnVjdEFjdGl2ZUZvcm1hdHRpbmdFbGVtZW50cyBjYWxscyB0aGlzIG1ldGhv ZCB0byBvcGVuCisgICAgLy8gYSBzZWNvbmQgPGI+IHRhZyB0byB3cmFwIFRFWFQsIGl0IHdpbGwg aGF2ZSBpZCAiMiIsIGV2ZW4gdGhvdWdoIHRoZSBIVE1MNQorICAgIC8vIHNwZWMgaW1wbGllcyBp dCBzaG91bGQgYmUgIjEiLiAgTWluZWZpZWxkIG1hdGNoZXMgdGhlIEhUTUw1IHNwZWMgaGVyZS4K KworICAgIEFTU0VSVChlbGVtZW50LT5pc0hUTUxFbGVtZW50KCkpOyAvLyBvdGhlcndpc2UgbG9j YWxOYW1lKCkgbWlnaHQgYmUgd3JvbmcuCisgICAgQXRvbWljSFRNTFRva2VuIGZha2VUb2tlbihI VE1MVG9rZW46OlN0YXJ0VGFnLCBlbGVtZW50LT5sb2NhbE5hbWUoKSwgY2xvbmVBdHRyaWJ1dGVz KGVsZW1lbnQpKTsKKyAgICByZXR1cm4gY3JlYXRlSFRNTEVsZW1lbnQoZmFrZVRva2VuKTsKK30K KwogYm9vbCBIVE1MQ29uc3RydWN0aW9uU2l0ZTo6aW5kZXhPZkZpcnN0VW5vcGVuRm9ybWF0dGlu Z0VsZW1lbnQodW5zaWduZWQmIGZpcnN0VW5vcGVuRWxlbWVudEluZGV4KSBjb25zdAogewogICAg IGlmIChtX2FjdGl2ZUZvcm1hdHRpbmdFbGVtZW50cy5pc0VtcHR5KCkpCkBAIC0zMTksOSArMzYw LDggQEAgdm9pZCBIVE1MQ29uc3RydWN0aW9uU2l0ZTo6cmVjb25zdHJ1Y3RUaGVBY3RpdmVGb3Jt YXR0aW5nRWxlbWVudHMoKQogICAgIEFTU0VSVCh1bm9wZW5FbnRyeUluZGV4IDwgbV9hY3RpdmVG b3JtYXR0aW5nRWxlbWVudHMuc2l6ZSgpKTsKICAgICBmb3IgKDsgdW5vcGVuRW50cnlJbmRleCA8 IG1fYWN0aXZlRm9ybWF0dGluZ0VsZW1lbnRzLnNpemUoKTsgKyt1bm9wZW5FbnRyeUluZGV4KSB7 CiAgICAgICAgIEhUTUxGb3JtYXR0aW5nRWxlbWVudExpc3Q6OkVudHJ5JiB1bm9wZW5lZEVudHJ5 ID0gbV9hY3RpdmVGb3JtYXR0aW5nRWxlbWVudHMuYXQodW5vcGVuRW50cnlJbmRleCk7Ci0gICAg ICAgIC8vIEZJWE1FOiBXZSdyZSBzdXBwb3NlZCB0byBzYXZlIHRoZSBvcmlnaW5hbCB0b2tlbiBp biB0aGUgZW50cnkuCi0gICAgICAgIEF0b21pY0hUTUxUb2tlbiBmYWtlVG9rZW4oSFRNTFRva2Vu OjpTdGFydFRhZywgdW5vcGVuZWRFbnRyeS5lbGVtZW50KCktPmxvY2FsTmFtZSgpKTsKLSAgICAg ICAgaW5zZXJ0SFRNTEVsZW1lbnQoZmFrZVRva2VuKTsKKyAgICAgICAgUmVmUHRyPEVsZW1lbnQ+ IHJlY29uc3RydWN0ZWQgPSBjcmVhdGVIVE1MRWxlbWVudEZyb21TYXZlZEVsZW1lbnQodW5vcGVu ZWRFbnRyeS5lbGVtZW50KCkpOworICAgICAgICBtX29wZW5FbGVtZW50cy5wdXNoKGF0dGFjaFRv Q3VycmVudChyZWNvbnN0cnVjdGVkLnJlbGVhc2UoKSkpOwogICAgICAgICB1bm9wZW5lZEVudHJ5 LnJlcGxhY2VFbGVtZW50KGN1cnJlbnRFbGVtZW50KCkpOwogICAgIH0KIH0KZGlmZiAtLWdpdCBh L1dlYkNvcmUvaHRtbC9IVE1MQ29uc3RydWN0aW9uU2l0ZS5oIGIvV2ViQ29yZS9odG1sL0hUTUxD b25zdHJ1Y3Rpb25TaXRlLmgKaW5kZXggYzBhZjliM2ExMjEyOTdkZmVkMjYyMjAwMGRkMTVhNjRh ODJmMjVmMy4uMzVkZmMwZWVkZjU0MGQzNmRhMDhmNjljMDQ0NDc3YTQ2MDE3OWNlMiAxMDA2NDQK LS0tIGEvV2ViQ29yZS9odG1sL0hUTUxDb25zdHJ1Y3Rpb25TaXRlLmgKKysrIGIvV2ViQ29yZS9o dG1sL0hUTUxDb25zdHJ1Y3Rpb25TaXRlLmgKQEAgLTY0LDYgKzY0LDggQEAgcHVibGljOgogICAg IHZvaWQgaW5zZXJ0SFRNTEJvZHlTdGFydFRhZ0luQm9keShBdG9taWNIVE1MVG9rZW4mKTsKIAog ICAgIFBhc3NSZWZQdHI8RWxlbWVudD4gY3JlYXRlSFRNTEVsZW1lbnQoQXRvbWljSFRNTFRva2Vu Jik7CisgICAgLy8gVXNlZCBieSB0aGUgYWRvcHRpb24gYWdlbmN5LgorICAgIFBhc3NSZWZQdHI8 RWxlbWVudD4gY3JlYXRlSFRNTEVsZW1lbnRGcm9tRWxlbWVudFJlY29yZChIVE1MRWxlbWVudFN0 YWNrOjpFbGVtZW50UmVjb3JkKik7CiAKICAgICB2b2lkIGZvc3RlclBhcmVudChOb2RlKik7CiAK QEAgLTExMywxMyArMTE1LDE0IEBAIHByaXZhdGU6CiAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBD aGlsZFR5cGU+CiAgICAgUGFzc1JlZlB0cjxDaGlsZFR5cGU+IGF0dGFjaChOb2RlKiBwYXJlbnQs IFBhc3NSZWZQdHI8Q2hpbGRUeXBlPiBjaGlsZCk7CisgICAgUGFzc1JlZlB0cjxFbGVtZW50PiBh dHRhY2hUb0N1cnJlbnQoUGFzc1JlZlB0cjxFbGVtZW50Pik7CiAKICAgICB2b2lkIGF0dGFjaEF0 U2l0ZShjb25zdCBBdHRhY2htZW50U2l0ZSYsIFBhc3NSZWZQdHI8Tm9kZT4gY2hpbGQpOwogICAg IHZvaWQgZmluZEZvc3RlclNpdGUoQXR0YWNobWVudFNpdGUmKTsKIAorICAgIFBhc3NSZWZQdHI8 RWxlbWVudD4gY3JlYXRlSFRNTEVsZW1lbnRGcm9tU2F2ZWRFbGVtZW50KEVsZW1lbnQqKTsKICAg ICBQYXNzUmVmUHRyPEVsZW1lbnQ+IGNyZWF0ZUVsZW1lbnQoQXRvbWljSFRNTFRva2VuJiwgY29u c3QgQXRvbWljU3RyaW5nJiBuYW1lc3BhY2VVUkkpOwogCi0gICAgUGFzc1JlZlB0cjxFbGVtZW50 PiBjcmVhdGVIVE1MRWxlbWVudEFuZEF0dGFjaFRvQ3VycmVudChBdG9taWNIVE1MVG9rZW4mKTsK ICAgICB2b2lkIG1lcmdlQXR0cmlidXRlc0Zyb21Ub2tlbkludG9FbGVtZW50KEF0b21pY0hUTUxU b2tlbiYsIEVsZW1lbnQqKTsKIAogICAgIERvY3VtZW50KiBtX2RvY3VtZW50OwpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5jcHAgYi9XZWJDb3JlL2h0bWwvSFRNTFRy ZWVCdWlsZGVyLmNwcAppbmRleCBmZDYxZWQwZjgwZjUxNjhlYjJiMGUxNjhiNzc0MTM2YmU3NGU2 M2RkLi5jNTI0YWU4M2Y0NGZlOGQ4ZDgzZjViZmZjM2IwZTExODlkOTRhYjQ3IDEwMDY0NAotLS0g YS9XZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRN TFRyZWVCdWlsZGVyLmNwcApAQCAtMTY3NSwxMSArMTY3NSw3IEBAIHZvaWQgSFRNTFRyZWVCdWls ZGVyOjpjYWxsVGhlQWRvcHRpb25BZ2VuY3koQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAg ICAgICAgIGlmIChub2RlID09IGZvcm1hdHRpbmdFbGVtZW50UmVjb3JkKQogICAgICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICAgICAgLy8gNi41Ci0gICAgICAgICAgICAvLyBGSVhNRTogV2Un cmUgc3VwcG9zZWQgdG8gc2F2ZSB0aGUgb3JpZ2luYWwgdG9rZW4gaW4gdGhlIGVudHJ5LgotICAg ICAgICAgICAgQXRvbWljSFRNTFRva2VuIGZha2VUb2tlbihIVE1MVG9rZW46OlN0YXJ0VGFnLCBu b2RlLT5lbGVtZW50KCktPmxvY2FsTmFtZSgpKTsKLSAgICAgICAgICAgIC8vIElzIGNyZWF0ZUhU TUxFbGVtZW50IGNvcnJlY3Q/IChpbnN0ZWFkIG9mIGluc2VydEhUTUxFbGVtZW50KQotICAgICAg ICAgICAgLy8gRG9lcyB0aGlzIGNvZGUgZXZlciBsZWF2ZSBuZXdFbGVtZW50IHVuYXR0YWNoZWQ/ Ci0gICAgICAgICAgICBSZWZQdHI8RWxlbWVudD4gbmV3RWxlbWVudCA9IG1fdHJlZS5jcmVhdGVI VE1MRWxlbWVudChmYWtlVG9rZW4pOworICAgICAgICAgICAgUmVmUHRyPEVsZW1lbnQ+IG5ld0Vs ZW1lbnQgPSBtX3RyZWUuY3JlYXRlSFRNTEVsZW1lbnRGcm9tRWxlbWVudFJlY29yZChub2RlKTsK ICAgICAgICAgICAgIEhUTUxGb3JtYXR0aW5nRWxlbWVudExpc3Q6OkVudHJ5KiBub2RlRW50cnkg PSBtX3RyZWUuYWN0aXZlRm9ybWF0dGluZ0VsZW1lbnRzKCktPmZpbmQobm9kZS0+ZWxlbWVudCgp KTsKICAgICAgICAgICAgIG5vZGVFbnRyeS0+cmVwbGFjZUVsZW1lbnQobmV3RWxlbWVudC5nZXQo KSk7CiAgICAgICAgICAgICBub2RlLT5yZXBsYWNlRWxlbWVudChuZXdFbGVtZW50LnJlbGVhc2Uo KSk7CkBAIC0xNzA4LDkgKzE3MDQsNyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6Y2FsbFRoZUFk b3B0aW9uQWdlbmN5KEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgICAgICAgICBBU1NFUlQo IWVjKTsKICAgICAgICAgfQogICAgICAgICAvLyA4Ci0gICAgICAgIC8vIEZJWE1FOiBXZSdyZSBz dXBwb3NlZCB0byBzYXZlIHRoZSBvcmlnaW5hbCB0b2tlbiBpbiB0aGUgZW50cnkuCi0gICAgICAg IEF0b21pY0hUTUxUb2tlbiBmYWtlVG9rZW4oSFRNTFRva2VuOjpTdGFydFRhZywgZm9ybWF0dGlu Z0VsZW1lbnQtPmxvY2FsTmFtZSgpKTsKLSAgICAgICAgUmVmUHRyPEVsZW1lbnQ+IG5ld0VsZW1l bnQgPSBtX3RyZWUuY3JlYXRlSFRNTEVsZW1lbnQoZmFrZVRva2VuKTsKKyAgICAgICAgUmVmUHRy PEVsZW1lbnQ+IG5ld0VsZW1lbnQgPSBtX3RyZWUuY3JlYXRlSFRNTEVsZW1lbnRGcm9tRWxlbWVu dFJlY29yZChmb3JtYXR0aW5nRWxlbWVudFJlY29yZCk7CiAgICAgICAgIC8vIDkKICAgICAgICAg cmVwYXJlbnRDaGlsZHJlbihmdXJ0aGVzdEJsb2NrLT5lbGVtZW50KCksIG5ld0VsZW1lbnQuZ2V0 KCkpOwogICAgICAgICAvLyAxMAo=