44447 2010-08-23 12:06:52 -0700 fast/dom/script-innerHTML-x.xhtml fails when run with the HTML5 TreeBuilder in fragment mode 2010-08-23 16:44:21 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric eric abarth ossy oldest_to_newest 268039 0 eric 2010-08-23 12:06:52 -0700 fast/dom/script-innerHTML-x.xhtml fails when run with the HTML5 TreeBuilder in fragment mode 268040 1 65147 eric 2010-08-23 12:08:01 -0700 Created attachment 65147 Patch 268045 2 65147 abarth 2010-08-23 12:12:43 -0700 Comment on attachment 65147 Patch This is parsing work. It should be in the parser. 268071 3 65156 eric 2010-08-23 13:06:46 -0700 Created attachment 65156 Patch 268154 4 65175 eric 2010-08-23 16:26:43 -0700 Created attachment 65175 Patch 268156 5 eric 2010-08-23 16:27:58 -0700 Please do not r+ this patch until the Qt EWS shows green. :) Otherwise it's ready for prime-time. 268157 6 eric 2010-08-23 16:28:35 -0700 Restructuring the code to allow this to be in the parser ended up being a bunch of work.... But this was a Yak I've wanted to shave for a long time. The world is better as a result. :) 268167 7 65175 abarth 2010-08-23 16:35:41 -0700 Comment on attachment 65175 Patch Ok. Thanks for putting this code in the right place. 268179 8 eric 2010-08-23 16:44:21 -0700 Committed r65842: <http://trac.webkit.org/changeset/65842> 65147 2010-08-23 12:08:01 -0700 2010-08-23 13:06:43 -0700 Patch bug-44447-20100823120800.patch text/plain 2273 eric ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NzEzYmY0MjlmMDRlNjllYjExMzIyNTllNGYyYTJmZTkyOTAzOTg0Yi4uYmMzNDYzMmQwZDA2OTQ5 MjVmNTI3MTQyNzNmODkyZWUzMzcyZGJlOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wOC0yMyAgRXJp YyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgZmFzdC9kb20vc2NyaXB0LWlubmVySFRNTC14LnhodG1sIGZh aWxzIHdoZW4gcnVuIHdpdGggdGhlIEhUTUw1IFRyZWVCdWlsZGVyIGluIGZyYWdtZW50IG1vZGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0NDQ3CisK KyAgICAgICAgVGhpcyBzcGVjaWFsIGhhbmRsaW5nIGZvciBzY3JpcHQvc3R5bGUgdXNlZCB0byBl eGlzdCBpbgorICAgICAgICBzZXRJbm5lckhUTUwuICBIVE1MNSBtb3ZlcyB0aGlzIGxvZ2ljIGlu dG8gdGhlIEhUTUwgYW5kIFhNTAorICAgICAgICBwYXJzZXJzIGluc3RlYWQgb2YgaW4gc2V0SW5u ZXJIVE1MLgorCisgICAgICAgIENvdmVyZWQgYnkgZmFzdC9kb20vc2NyaXB0LWlubmVySFRNTC14 LnhodG1sLgorCisgICAgICAgICogZG9tL0RvY3VtZW50RnJhZ21lbnQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RG9jdW1lbnRGcmFnbWVudDo6cGFyc2VYTUwpOgorCiAyMDEwLTA4LTIzICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBT ZWlkZWwuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9Eb2N1bWVudEZyYWdtZW50LmNwcCBiL1dl YkNvcmUvZG9tL0RvY3VtZW50RnJhZ21lbnQuY3BwCmluZGV4IDcwZTU3YjkwYmE5NzUyYTU2OTZl MjU4ZjQ5ZmNkODA3ZmFiM2FmMTAuLmU4OWNkZDZkM2VlOTUzY2UyMGE1ZTEyOWFhODFjNDhiZDM2 ZmVkODkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL0RvY3VtZW50RnJhZ21lbnQuY3BwCisrKyBi L1dlYkNvcmUvZG9tL0RvY3VtZW50RnJhZ21lbnQuY3BwCkBAIC0yNCw5ICsyNCwxMiBAQAogI2lu Y2x1ZGUgIkRvY3VtZW50RnJhZ21lbnQuaCIKIAogI2luY2x1ZGUgIkRvY3VtZW50LmgiCisjaW5j bHVkZSAiRWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxEb2N1bWVudFBhcnNlci5oIgorI2luY2x1 ZGUgIkhUTUxOYW1lcy5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJTZXR0aW5ncy5o IgorI2luY2x1ZGUgIlRleHQuaCIKICNpbmNsdWRlICJYTUxEb2N1bWVudFBhcnNlci5oIgogCiBu YW1lc3BhY2UgV2ViQ29yZSB7CkBAIC04OCw2ICs5MSwxNiBAQCB2b2lkIERvY3VtZW50RnJhZ21l bnQ6OnBhcnNlSFRNTChjb25zdCBTdHJpbmcmIHNvdXJjZSwgRWxlbWVudCogY29udGV4dEVsZW1l bnQsCiAKIGJvb2wgRG9jdW1lbnRGcmFnbWVudDo6cGFyc2VYTUwoY29uc3QgU3RyaW5nJiBzb3Vy Y2UsIEVsZW1lbnQqIGNvbnRleHRFbGVtZW50LCBGcmFnbWVudFNjcmlwdGluZ1Blcm1pc3Npb24g c2NyaXB0aW5nUGVybWlzc2lvbikKIHsKKyAgICAvLyBGSVhNRTogV2UgbmVlZCB0byBpbXBsZW1l bnQgdGhlIEhUTUw1IFhNTCBGcmFnbWVudCBwYXJzaW5nIGFsZ29yaXRobToKKyAgICAvLyBodHRw Oi8vd3d3LndoYXR3Zy5vcmcvc3BlY3Mvd2ViLWFwcHMvY3VycmVudC13b3JrL211bHRpcGFnZS90 aGUteGh0bWwtc3ludGF4Lmh0bWwjeG1sLWZyYWdtZW50LXBhcnNpbmctYWxnb3JpdGhtCisgICAg Ly8gRm9yIG5vdyB3ZSBoYXZlIGEgaGFjayBmb3Igc2NyaXB0L3N0eWxlIGlubmVySFRNTCBzdXBw b3J0OgorICAgIGlmIChjb250ZXh0RWxlbWVudCAmJiAoY29udGV4dEVsZW1lbnQtPmhhc0xvY2Fs TmFtZShIVE1MTmFtZXM6OnNjcmlwdFRhZykgfHwgY29udGV4dEVsZW1lbnQtPmhhc0xvY2FsTmFt ZShIVE1MTmFtZXM6OnN0eWxlVGFnKSkpIHsKKyAgICAgICAgRXhjZXB0aW9uQ29kZSBlYzsKKyAg ICAgICAgYXBwZW5kQ2hpbGQoZG9jdW1lbnQoKS0+Y3JlYXRlVGV4dE5vZGUoc291cmNlKSwgZWMp OworICAgICAgICBBU1NFUlQoIWVjKTsKKyAgICAgICAgcmV0dXJuICFlYzsKKyAgICB9CisKICAg ICByZXR1cm4gWE1MRG9jdW1lbnRQYXJzZXI6OnBhcnNlRG9jdW1lbnRGcmFnbWVudChzb3VyY2Us IHRoaXMsIGNvbnRleHRFbGVtZW50LCBzY3JpcHRpbmdQZXJtaXNzaW9uKTsKIH0KIAo= 65156 2010-08-23 13:06:46 -0700 2010-08-23 16:26:40 -0700 Patch bug-44447-20100823130644.patch text/plain 8471 eric ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NzEzYmY0MjlmMDRlNjllYjExMzIyNTllNGYyYTJmZTkyOTAzOTg0Yi4uOTU5ZGRiNGYzYjEzOTky NWQ2ZTA5OTMzYjlkMmE2NmIyYzYyMGJhOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNiBAQAorMjAxMC0wOC0yMyAgRXJp YyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgZmFzdC9kb20vc2NyaXB0LWlubmVySFRNTC14LnhodG1sIGZh aWxzIHdoZW4gcnVuIHdpdGggdGhlIEhUTUw1IFRyZWVCdWlsZGVyIGluIGZyYWdtZW50IG1vZGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0NDQ3CisK KyAgICAgICAgVGhpcyBzcGVjaWFsIGhhbmRsaW5nIGZvciBzY3JpcHQvc3R5bGUgdXNlZCB0byBl eGlzdCBpbgorICAgICAgICBzZXRJbm5lckhUTUwuICBIVE1MNSBtb3ZlcyB0aGlzIGxvZ2ljIGlu dG8gdGhlIEhUTUwgYW5kIFhNTAorICAgICAgICBwYXJzZXJzIGluc3RlYWQgb2YgaW4gc2V0SW5u ZXJIVE1MLgorCisgICAgICAgIEluIG9yZGVyIHRvIHNoYXJlIHRoaXMgbG9naWMgYmV0d2VlbiBX ZWJLaXQncyB0d28gWE1MIHBhcnNlcnMKKyAgICAgICAgSSBoYWQgdG8gY2xlYW4gdXAgYSBiaXQg b2YgdGhlIGxpYnhtbDIgcGFyc2VyIGFuZCBhZGQgYQorICAgICAgICBuZXcgYXBwZW5kRnJhZ21l bnRTb3VyY2UgbWV0aG9kLgorCisgICAgICAgIENvdmVyZWQgYnkgZmFzdC9kb20vc2NyaXB0LWlu bmVySFRNTC14LnhodG1sLgorCisgICAgICAgICogZG9tL1hNTERvY3VtZW50UGFyc2VyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlhNTERvY3VtZW50UGFyc2VyOjplbmQpOgorICAgICAgICAgLSBO b3cgdGhhdCBsaWJ4bWwyIGlzIGNhbGxpbmcgZmluaXNoKCkgZm9yIGZyYWdtZW50cyAoUXQgYWxy ZWFkeSB3YXMpCisgICAgICAgICAgIEkgd2VudCB0aHJvdWdoIGFuZCByZW1vdmVkIHRoaXMgdW5u ZWVkZWQgc3R5bGUgdXBkYXRlIGFmdGVyIGZyYWdtZW50IHBhcnNpbmcuCisgICAgICAgIChXZWJD b3JlOjpYTUxEb2N1bWVudFBhcnNlcjo6cGFyc2VEb2N1bWVudEZyYWdtZW50KToKKyAgICAgICAg IC0gWWF5IGZvciBzaGFyZWQgY29kZSEKKyAgICAgICAgIC0gVGhpcyBpcyB3aGVyZSBJIGFkZGVk IHRoZSBzdHlsZS9zY3JpcHQgaGFjayBtb3ZlZCBmcm9tIHNldElubmVySFRNTC4KKyAgICAgICAg KiBkb20vWE1MRG9jdW1lbnRQYXJzZXIuaDoKKyAgICAgICAgIC0gRml4IGluZGVudC4KKyAgICAg ICAgKiBkb20vWE1MRG9jdW1lbnRQYXJzZXJMaWJ4bWwyLmNwcDoKKyAgICAgICAgIC0gUmVtb3Zl ZCBwYXJzZURvY3VtZW50RnJhZ21lbnQgYW5kIG1vdmVkIG5lY2Vzc2FyeSBsaWJ4bWwtc3BlY2lm aWMKKyAgICAgICAgICAgbG9naWMgaW50byBhcHBlbmRGcmFnbWVudFNvdXJjZS4KKyAgICAgICAg KFdlYkNvcmU6OlhNTERvY3VtZW50UGFyc2VyOjphcHBlbmRGcmFnbWVudFNvdXJjZSk6CisgICAg ICAgICogZG9tL1hNTERvY3VtZW50UGFyc2VyUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6WE1M RG9jdW1lbnRQYXJzZXI6OmFwcGVuZEZyYWdtZW50U291cmNlKToKKwogMjAxMC0wOC0yMyAgQWRh bSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMg U2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9kb20vWE1MRG9jdW1lbnRQYXJzZXIuY3BwIGIv V2ViQ29yZS9kb20vWE1MRG9jdW1lbnRQYXJzZXIuY3BwCmluZGV4IGEzODI4ZDVkYjNhMGY4ZTA1 YzJiODI2YTE4NTdiY2YyMmRjMDc5NDYuLjgyYjM1NDMyMjA4NGYyZmNmY2E1YzBjMGVjZWQ2ZTI3 YzQyZmMyZmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL1hNTERvY3VtZW50UGFyc2VyLmNwcAor KysgYi9XZWJDb3JlL2RvbS9YTUxEb2N1bWVudFBhcnNlci5jcHAKQEAgLTIyMyw3ICsyMjMsOCBA QCB2b2lkIFhNTERvY3VtZW50UGFyc2VyOjplbmQoKQogICAgICAgICBpbnNlcnRFcnJvck1lc3Nh Z2VCbG9jaygpOwogICAgIGVsc2UgewogICAgICAgICBleGl0VGV4dCgpOwotICAgICAgICBkb2N1 bWVudCgpLT51cGRhdGVTdHlsZVNlbGVjdG9yKCk7CisgICAgICAgIGlmICghbV9wYXJzaW5nRnJh Z21lbnQpCisgICAgICAgICAgICBkb2N1bWVudCgpLT51cGRhdGVTdHlsZVNlbGVjdG9yKCk7CiAg ICAgfQogCiAgICAgY2xlYXJDdXJyZW50Tm9kZVN0YWNrKCk7CkBAIC0zNjksNCArMzcwLDI0IEBA IHZvaWQgWE1MRG9jdW1lbnRQYXJzZXI6OnBhdXNlUGFyc2luZygpCiAgICAgbV9wYXJzZXJQYXVz ZWQgPSB0cnVlOwogfQogCitib29sIFhNTERvY3VtZW50UGFyc2VyOjpwYXJzZURvY3VtZW50RnJh Z21lbnQoY29uc3QgU3RyaW5nJiBjaHVuaywgRG9jdW1lbnRGcmFnbWVudCogZnJhZ21lbnQsIEVs ZW1lbnQqIGNvbnRleHRFbGVtZW50LCBGcmFnbWVudFNjcmlwdGluZ1Blcm1pc3Npb24gc2NyaXB0 aW5nUGVybWlzc2lvbikKK3sKKyAgICBpZiAoIWNodW5rLmxlbmd0aCgpKQorICAgICAgICByZXR1 cm4gdHJ1ZTsKKworICAgIC8vIEZJWE1FOiBXZSBuZWVkIHRvIGltcGxlbWVudCB0aGUgSFRNTDUg WE1MIEZyYWdtZW50IHBhcnNpbmcgYWxnb3JpdGhtOgorICAgIC8vIGh0dHA6Ly93d3cud2hhdHdn Lm9yZy9zcGVjcy93ZWItYXBwcy9jdXJyZW50LXdvcmsvbXVsdGlwYWdlL3RoZS14aHRtbC1zeW50 YXguaHRtbCN4bWwtZnJhZ21lbnQtcGFyc2luZy1hbGdvcml0aG0KKyAgICAvLyBGb3Igbm93IHdl IGhhdmUgYSBoYWNrIGZvciBzY3JpcHQvc3R5bGUgaW5uZXJIVE1MIHN1cHBvcnQ6CisgICAgaWYg KGNvbnRleHRFbGVtZW50ICYmIChjb250ZXh0RWxlbWVudC0+aGFzTG9jYWxOYW1lKEhUTUxOYW1l czo6c2NyaXB0VGFnKSB8fCBjb250ZXh0RWxlbWVudC0+aGFzTG9jYWxOYW1lKEhUTUxOYW1lczo6 c3R5bGVUYWcpKSkgeworICAgICAgICBmcmFnbWVudC0+cGFyc2VyQWRkQ2hpbGQoZnJhZ21lbnQt PmRvY3VtZW50KCktPmNyZWF0ZVRleHROb2RlKGNodW5rKSk7CisgICAgICAgIHJldHVybiB0cnVl OworICAgIH0KKworICAgIFJlZlB0cjxYTUxEb2N1bWVudFBhcnNlcj4gcGFyc2VyID0gWE1MRG9j dW1lbnRQYXJzZXI6OmNyZWF0ZShmcmFnbWVudCwgY29udGV4dEVsZW1lbnQsIHNjcmlwdGluZ1Bl cm1pc3Npb24pOworICAgIHBhcnNlci0+YXBwZW5kRnJhZ21lbnRTb3VyY2UoY2h1bmspOworICAg IHBhcnNlci0+ZmluaXNoKCk7CisgICAgcGFyc2VyLT5kZXRhY2goKTsgLy8gQWxsb3dzIH5Eb2N1 bWVudFBhcnNlciB0byBhc3NlcnQgaXQgd2FzIGRldGFjaGVkIGJlZm9yZSBkZXN0cnVjdGlvbi4K KyAgICByZXR1cm4gcGFyc2VyLT53ZWxsRm9ybWVkKCk7CiB9CisKK30gLy8gbmFtZXNwYWNlIFdl YkNvcmUKZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9tL1hNTERvY3VtZW50UGFyc2VyLmggYi9XZWJD b3JlL2RvbS9YTUxEb2N1bWVudFBhcnNlci5oCmluZGV4IGNkYzc3MGVhNmVkZDQzOWE2NTY3ZTlk YWI0MTU3NjA2YmFkYWEzM2YuLjM5ZTcyNmJhZDE2MjEyODNmY2MzNjA0YjQxNjZlYTVkNTIzYjI2 M2MgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL1hNTERvY3VtZW50UGFyc2VyLmgKKysrIGIvV2Vi Q29yZS9kb20vWE1MRG9jdW1lbnRQYXJzZXIuaApAQCAtOTcsNyArOTcsNyBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAgICAgICAgIGJvb2wgaXNXTUxEb2N1bWVudCgpIGNvbnN0OwogI2VuZGlmCiAK LSAgICBzdGF0aWMgYm9vbCBwYXJzZURvY3VtZW50RnJhZ21lbnQoY29uc3QgU3RyaW5nJiwgRG9j dW1lbnRGcmFnbWVudCosIEVsZW1lbnQqIHBhcmVudCA9IDAsIEZyYWdtZW50U2NyaXB0aW5nUGVy bWlzc2lvbiA9IEZyYWdtZW50U2NyaXB0aW5nQWxsb3dlZCk7CisgICAgICAgIHN0YXRpYyBib29s IHBhcnNlRG9jdW1lbnRGcmFnbWVudChjb25zdCBTdHJpbmcmLCBEb2N1bWVudEZyYWdtZW50Kiwg RWxlbWVudCogcGFyZW50ID0gMCwgRnJhZ21lbnRTY3JpcHRpbmdQZXJtaXNzaW9uID0gRnJhZ21l bnRTY3JpcHRpbmdBbGxvd2VkKTsKIAogICAgICAgICAvLyBXTUxFcnJvckhhbmRsaW5nIHVzZXMg dGhlc2UgZnVuY3Rpb25zLgogICAgICAgICB2aXJ0dWFsIGJvb2wgd2VsbEZvcm1lZCgpIGNvbnN0 IHsgcmV0dXJuICFtX3Nhd0Vycm9yOyB9CkBAIC0xMjQsNiArMTI0LDggQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogICAgICAgICB2b2lkIHBhdXNlUGFyc2luZygpOwogICAgICAgICB2b2lkIHJlc3Vt ZVBhcnNpbmcoKTsKIAorICAgICAgICB2b2lkIGFwcGVuZEZyYWdtZW50U291cmNlKGNvbnN0IFN0 cmluZyYpOworCiAjaWYgVVNFKFFYTUxTVFJFQU0pCiBwcml2YXRlOgogICAgICAgICB2b2lkIHBh cnNlKCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9YTUxEb2N1bWVudFBhcnNlckxpYnhtbDIu Y3BwIGIvV2ViQ29yZS9kb20vWE1MRG9jdW1lbnRQYXJzZXJMaWJ4bWwyLmNwcAppbmRleCA4NjE4 NTNjNWRlZjY2MTFjZGQxNjg5ZGIyMmY4MDZhNzQ1NmUyYjMwLi5kYzBjNDFhNmExMTc0ZWZlNzc3 NzRlYTVmOTk4NGQzOGM0OWIwYzhkIDEwMDY0NAotLS0gYS9XZWJDb3JlL2RvbS9YTUxEb2N1bWVu dFBhcnNlckxpYnhtbDIuY3BwCisrKyBiL1dlYkNvcmUvZG9tL1hNTERvY3VtZW50UGFyc2VyTGli eG1sMi5jcHAKQEAgLTEyNzQsOCArMTI3NCwxMCBAQCB2b2lkIFhNTERvY3VtZW50UGFyc2VyOjpp bml0aWFsaXplUGFyc2VyQ29udGV4dChjb25zdCBjaGFyKiBjaHVuaykKICAgICBYTUxEb2N1bWVu dFBhcnNlclNjb3BlIHNjb3BlKGRvY3VtZW50KCktPmRvY0xvYWRlcigpKTsKICAgICBpZiAobV9w YXJzaW5nRnJhZ21lbnQpCiAgICAgICAgIG1fY29udGV4dCA9IFhNTFBhcnNlckNvbnRleHQ6OmNy ZWF0ZU1lbW9yeVBhcnNlcigmc2F4LCB0aGlzLCBjaHVuayk7Ci0gICAgZWxzZQorICAgIGVsc2Ug eworICAgICAgICBBU1NFUlQoIWNodW5rKTsKICAgICAgICAgbV9jb250ZXh0ID0gWE1MUGFyc2Vy Q29udGV4dDo6Y3JlYXRlU3RyaW5nUGFyc2VyKCZzYXgsIHRoaXMpOworICAgIH0KIH0KIAogdm9p ZCBYTUxEb2N1bWVudFBhcnNlcjo6ZG9FbmQoKQpAQCAtMTM3MSwzMSArMTM3MywyNSBAQCB2b2lk IFhNTERvY3VtZW50UGFyc2VyOjpyZXN1bWVQYXJzaW5nKCkKICAgICAgICAgZW5kKCk7CiB9CiAK LS8vIEZJWE1FOiBUaGlzIG1ldGhvZCBzaG91bGQgYmUgcG9zc2libGUgdG8gaW1wbGVtZW50IHVz aW5nIHRoZSBEb2N1bWVudFBhcnNlcgotLy8gQVBJLCBpbnN0ZWFkIG9mIG5lZWRpbmcgdG8gZ3Jh YiBhdCBsaWJ4bWwyIHN0YXRlIGRpcmVjdGx5LgotYm9vbCBYTUxEb2N1bWVudFBhcnNlcjo6cGFy c2VEb2N1bWVudEZyYWdtZW50KGNvbnN0IFN0cmluZyYgY2h1bmssIERvY3VtZW50RnJhZ21lbnQq IGZyYWdtZW50LCBFbGVtZW50KiBwYXJlbnQsIEZyYWdtZW50U2NyaXB0aW5nUGVybWlzc2lvbiBz Y3JpcHRpbmdQZXJtaXNzaW9uKQordm9pZCBYTUxEb2N1bWVudFBhcnNlcjo6YXBwZW5kRnJhZ21l bnRTb3VyY2UoY29uc3QgU3RyaW5nJiBjaHVuaykKIHsKLSAgICBpZiAoIWNodW5rLmxlbmd0aCgp KQotICAgICAgICByZXR1cm4gdHJ1ZTsKLQotICAgIFJlZlB0cjxYTUxEb2N1bWVudFBhcnNlcj4g cGFyc2VyID0gWE1MRG9jdW1lbnRQYXJzZXI6OmNyZWF0ZShmcmFnbWVudCwgcGFyZW50LCBzY3Jp cHRpbmdQZXJtaXNzaW9uKTsKKyAgICBBU1NFUlQoIW1fY29udGV4dCk7CisgICAgQVNTRVJUKG1f cGFyc2luZ0ZyYWdtZW50KTsKIAogICAgIENTdHJpbmcgY2h1bmtBc1V0ZjggPSBjaHVuay51dGY4 KCk7Ci0gICAgcGFyc2VyLT5pbml0aWFsaXplUGFyc2VyQ29udGV4dChjaHVua0FzVXRmOC5kYXRh KCkpOwotCi0gICAgeG1sUGFyc2VDb250ZW50KHBhcnNlci0+Y29udGV4dCgpKTsKLQotICAgIHBh cnNlci0+ZW5kRG9jdW1lbnQoKTsKKyAgICBpbml0aWFsaXplUGFyc2VyQ29udGV4dChjaHVua0Fz VXRmOC5kYXRhKCkpOworICAgIHhtbFBhcnNlQ29udGVudChjb250ZXh0KCkpOwogCisgICAgLy8g RklYTUU6IElmIHRoaXMgY29kZSBpcyBhY3R1YWxseSBuZWVkZWQsIGl0IHNob3VsZCBwcm9iYWJs eSBtb3ZlIHRvIGZpbmlzaCgpCisgICAgLy8gWE1MRG9jdW1lbnRQYXJzZXJRdCBoYXMgYSBzaW1p bGFyIGNoZWNrIChtX3N0cmVhbS5lcnJvcigpID09IFFYbWxTdHJlYW1SZWFkZXI6OlByZW1hdHVy ZUVuZE9mRG9jdW1lbnRFcnJvcikgaW4gZG9FbmQoKS4KICAgICAvLyBDaGVjayBpZiBhbGwgdGhl IGNodW5rIGhhcyBiZWVuIHByb2Nlc3NlZC4KLSAgICBsb25nIGJ5dGVzUHJvY2Vzc2VkID0geG1s Qnl0ZUNvbnN1bWVkKHBhcnNlci0+Y29udGV4dCgpKTsKLSAgICBpZiAoYnl0ZXNQcm9jZXNzZWQg PT0gLTEgfHwgKCh1bnNpZ25lZCBsb25nKWJ5dGVzUHJvY2Vzc2VkKSAhPSBjaHVua0FzVXRmOC5s ZW5ndGgoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgcGFyc2VyLT5kZXRhY2goKTsg Ly8gQWxsb3dzIH5Eb2N1bWVudFBhcnNlciB0byBhc3NlcnQgaXQgd2FzIGRldGFjaGVkIGJlZm9y ZSBkZXN0cnVjdGlvbi4KLQotICAgIC8vIE5vIGVycm9yIGlmIHRoZSBjaHVuayBpcyB3ZWxsIGZv cm1lZCBvciBpdCBpcyBub3QgYnV0IHdlIGhhdmUgbm8gZXJyb3IuCi0gICAgcmV0dXJuIHBhcnNl ci0+Y29udGV4dCgpLT53ZWxsRm9ybWVkIHx8ICF4bWxDdHh0R2V0TGFzdEVycm9yKHBhcnNlci0+ Y29udGV4dCgpKTsKKyAgICBsb25nIGJ5dGVzUHJvY2Vzc2VkID0geG1sQnl0ZUNvbnN1bWVkKGNv bnRleHQoKSk7CisgICAgaWYgKGJ5dGVzUHJvY2Vzc2VkID09IC0xIHx8ICgodW5zaWduZWQgbG9u ZylieXRlc1Byb2Nlc3NlZCkgIT0gY2h1bmtBc1V0ZjgubGVuZ3RoKCkpIHsKKyAgICAgICAgLy8g RklYTUU6IEkgZG9uJ3QgYmVsaWV2ZSB3ZSBjYW4gaGl0IHRoaXMgY2FzZSB3aXRob3V0IGFsc28g aGF2aW5nIHNlZW4gYW4gZXJyb3IuCisgICAgICAgIC8vIElmIHdlIGhpdCB0aGlzIEFTU0VSVCwg d2UndmUgZm91bmQgYSB0ZXN0IGNhc2Ugd2hpY2ggZGVtb25zdHJhdGVzIHRoZSBuZWVkIGZvciB0 aGlzIGNvZGUuCisgICAgICAgIEFTU0VSVChtX3Nhd0Vycm9yKTsKKyAgICAgICAgbV9zYXdFcnJv ciA9IHRydWU7CisgICAgfQogfQogCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9kb20vWE1MRG9jdW1lbnRQYXJzZXJRdC5jcHAgYi9XZWJD b3JlL2RvbS9YTUxEb2N1bWVudFBhcnNlclF0LmNwcAppbmRleCAxNDhjZmYwYzUzZGVhMTBhZDM5 NGMwNmViOTA2YzY4MmM4ZTU0NjAyLi5kOWM0OGJjNTVmNmVlZjc3NTc0YzA2ZDkzOGEyZWE3NTEw NzdiNWFiIDEwMDY0NAotLS0gYS9XZWJDb3JlL2RvbS9YTUxEb2N1bWVudFBhcnNlclF0LmNwcAor KysgYi9XZWJDb3JlL2RvbS9YTUxEb2N1bWVudFBhcnNlclF0LmNwcApAQCAtMjU0LDE5ICsyNTQs MTIgQEAgdm9pZCBYTUxEb2N1bWVudFBhcnNlcjo6cmVzdW1lUGFyc2luZygpCiAgICAgICAgIGVu ZCgpOwogfQogCi1ib29sIFhNTERvY3VtZW50UGFyc2VyOjpwYXJzZURvY3VtZW50RnJhZ21lbnQo Y29uc3QgU3RyaW5nJiBjaHVuaywgRG9jdW1lbnRGcmFnbWVudCogZnJhZ21lbnQsIEVsZW1lbnQq IHBhcmVudCwgRnJhZ21lbnRTY3JpcHRpbmdQZXJtaXNzaW9uIHNjcmlwdGluZ1Blcm1pc3Npb24p Cit2b2lkIFhNTERvY3VtZW50UGFyc2VyOjphcHBlbmRGcmFnbWVudFNvdXJjZShjb25zdCBTdHJp bmcmIHNvdXJjZSkKIHsKLSAgICBpZiAoIWNodW5rLmxlbmd0aCgpKQotICAgICAgICByZXR1cm4g dHJ1ZTsKLQotICAgIFJlZlB0cjxYTUxEb2N1bWVudFBhcnNlcj4gcGFyc2VyID0gWE1MRG9jdW1l bnRQYXJzZXI6OmNyZWF0ZShmcmFnbWVudCwgcGFyZW50LCBzY3JpcHRpbmdQZXJtaXNzaW9uKTsK LQotICAgIHBhcnNlci0+YXBwZW5kKFN0cmluZygiPHF4bWxzdHJlYW1kdW1teWVsZW1lbnQ+Iikp OwotICAgIHBhcnNlci0+YXBwZW5kKGNodW5rKTsKLSAgICBwYXJzZXItPmFwcGVuZChTdHJpbmco IjwvcXhtbHN0cmVhbWR1bW15ZWxlbWVudD4iKSk7Ci0gICAgcGFyc2VyLT5maW5pc2goKTsKLSAg ICBwYXJzZXItPmRldGFjaCgpOyAvLyBBbGxvd3MgfkRvY3VtZW50UGFyc2VyIHRvIGFzc2VydCBp dCB3YXMgZGV0YWNoZWQgYmVmb3JlIGRlc3RydWN0aW9uLgotICAgIHJldHVybiAhcGFyc2VyLT5o YXNFcnJvcigpOworICAgIEFTU0VSVCghbV9zYXdGaXJzdEVsZW1lbnQpOworICAgIGFwcGVuZChT dHJpbmcoIjxxeG1sc3RyZWFtZHVtbXllbGVtZW50PiIpKTsKKyAgICBhcHBlbmQoc291cmNlKTsK KyAgICBhcHBlbmQoU3RyaW5nKCI8L3F4bWxzdHJlYW1kdW1teWVsZW1lbnQ+IikpOwogfQogCiAv LyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQo= 65175 2010-08-23 16:26:43 -0700 2010-08-23 16:35:41 -0700 Patch bug-44447-20100823162641.patch text/plain 9157 eric ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTk0NjM4M2RiNzA0MDQ1MmMxZTgzMWVlMTJmNWI1OGQ2MjRkMmVhZC4uYWNkMjFlYmU4YzQwYjU0 YTFmNmQ0MWM3MGQ3NGI3N2U3NTVkZWJjYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNiBAQAorMjAxMC0wOC0yMyAgRXJp YyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgZmFzdC9kb20vc2NyaXB0LWlubmVySFRNTC14LnhodG1sIGZh aWxzIHdoZW4gcnVuIHdpdGggdGhlIEhUTUw1IFRyZWVCdWlsZGVyIGluIGZyYWdtZW50IG1vZGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0NDQ3CisK KyAgICAgICAgVGhpcyBzcGVjaWFsIGhhbmRsaW5nIGZvciBzY3JpcHQvc3R5bGUgdXNlZCB0byBl eGlzdCBpbgorICAgICAgICBzZXRJbm5lckhUTUwuICBIVE1MNSBtb3ZlcyB0aGlzIGxvZ2ljIGlu dG8gdGhlIEhUTUwgYW5kIFhNTAorICAgICAgICBwYXJzZXJzIGluc3RlYWQgb2YgaW4gc2V0SW5u ZXJIVE1MLgorCisgICAgICAgIEluIG9yZGVyIHRvIHNoYXJlIHRoaXMgbG9naWMgYmV0d2VlbiBX ZWJLaXQncyB0d28gWE1MIHBhcnNlcnMKKyAgICAgICAgSSBoYWQgdG8gY2xlYW4gdXAgYSBiaXQg b2YgdGhlIGxpYnhtbDIgcGFyc2VyIGFuZCBhZGQgYQorICAgICAgICBuZXcgYXBwZW5kRnJhZ21l bnRTb3VyY2UgbWV0aG9kLgorCisgICAgICAgIENvdmVyZWQgYnkgZmFzdC9kb20vc2NyaXB0LWlu bmVySFRNTC14LnhodG1sLgorCisgICAgICAgICogZG9tL1hNTERvY3VtZW50UGFyc2VyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlhNTERvY3VtZW50UGFyc2VyOjplbmQpOgorICAgICAgICAgLSBO b3cgdGhhdCBsaWJ4bWwyIGlzIGNhbGxpbmcgZmluaXNoKCkgZm9yIGZyYWdtZW50cyAoUXQgYWxy ZWFkeSB3YXMpCisgICAgICAgICAgIEkgd2VudCB0aHJvdWdoIGFuZCByZW1vdmVkIHRoaXMgdW5u ZWVkZWQgc3R5bGUgdXBkYXRlIGFmdGVyIGZyYWdtZW50IHBhcnNpbmcuCisgICAgICAgIChXZWJD b3JlOjpYTUxEb2N1bWVudFBhcnNlcjo6cGFyc2VEb2N1bWVudEZyYWdtZW50KToKKyAgICAgICAg IC0gWWF5IGZvciBzaGFyZWQgY29kZSEKKyAgICAgICAgIC0gVGhpcyBpcyB3aGVyZSBJIGFkZGVk IHRoZSBzdHlsZS9zY3JpcHQgaGFjayBtb3ZlZCBmcm9tIHNldElubmVySFRNTC4KKyAgICAgICAg KiBkb20vWE1MRG9jdW1lbnRQYXJzZXIuaDoKKyAgICAgICAgIC0gRml4IGluZGVudC4KKyAgICAg ICAgKiBkb20vWE1MRG9jdW1lbnRQYXJzZXJMaWJ4bWwyLmNwcDoKKyAgICAgICAgIC0gUmVtb3Zl ZCBwYXJzZURvY3VtZW50RnJhZ21lbnQgYW5kIG1vdmVkIG5lY2Vzc2FyeSBsaWJ4bWwtc3BlY2lm aWMKKyAgICAgICAgICAgbG9naWMgaW50byBhcHBlbmRGcmFnbWVudFNvdXJjZS4KKyAgICAgICAg KFdlYkNvcmU6OlhNTERvY3VtZW50UGFyc2VyOjphcHBlbmRGcmFnbWVudFNvdXJjZSk6CisgICAg ICAgICogZG9tL1hNTERvY3VtZW50UGFyc2VyUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6WE1M RG9jdW1lbnRQYXJzZXI6OmFwcGVuZEZyYWdtZW50U291cmNlKToKKwogMjAxMC0wOC0yMCAgU3Rl cGhlbiBXaGl0ZSAgPHNlbm9yYmxhbmNvQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBLZW5uZXRoIFJ1c3NlbGwuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9YTUxEb2N1bWVu dFBhcnNlci5jcHAgYi9XZWJDb3JlL2RvbS9YTUxEb2N1bWVudFBhcnNlci5jcHAKaW5kZXggYTM4 MjhkNWRiM2EwZjhlMDVjMmI4MjZhMTg1N2JjZjIyZGMwNzk0Ni4uMDU0ZTRlMzU5YWJkNTk0MTJk MjJmODY3ZTM0MTZhNzFiNWM3NjdkYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9kb20vWE1MRG9jdW1l bnRQYXJzZXIuY3BwCisrKyBiL1dlYkNvcmUvZG9tL1hNTERvY3VtZW50UGFyc2VyLmNwcApAQCAt MjEzLDYgKzIxMywxMCBAQCB2b2lkIFhNTERvY3VtZW50UGFyc2VyOjpleGl0VGV4dCgpCiAKIHZv aWQgWE1MRG9jdW1lbnRQYXJzZXI6OmVuZCgpCiB7CisgICAgLy8gWE1MRG9jdW1lbnRQYXJzZXJM aWJ4bWwyIHdpbGwgZG8gYmFkIHRoaW5ncyB0byB0aGUgZG9jdW1lbnQgaWYgZG9FbmQoKSBpcyBj YWxsZWQuCisgICAgLy8gSSBkb24ndCBiZWxpZXZlIFhNTERvY3VtZW50UGFyc2VyUXQgbmVlZHMg ZG9FbmQgY2FsbGVkIGluIHRoZSBmcmFnbWVudCBjYXNlLgorICAgIEFTU0VSVCghbV9wYXJzaW5n RnJhZ21lbnQpOworCiAgICAgZG9FbmQoKTsKIAogICAgIC8vIGRvRW5kKCkgY291bGQgcHJvY2Vz cyBhIHNjcmlwdCB0YWcsIHRodXMgcGF1c2luZyBwYXJzaW5nLgpAQCAtMjI3LDggKzIzMSw3IEBA IHZvaWQgWE1MRG9jdW1lbnRQYXJzZXI6OmVuZCgpCiAgICAgfQogCiAgICAgY2xlYXJDdXJyZW50 Tm9kZVN0YWNrKCk7Ci0gICAgaWYgKCFtX3BhcnNpbmdGcmFnbWVudCkKLSAgICAgICAgZG9jdW1l bnQoKS0+ZmluaXNoZWRQYXJzaW5nKCk7CisgICAgZG9jdW1lbnQoKS0+ZmluaXNoZWRQYXJzaW5n KCk7CiB9CiAKIHZvaWQgWE1MRG9jdW1lbnRQYXJzZXI6OmZpbmlzaCgpCkBAIC0zNjksNCArMzcy LDI1IEBAIHZvaWQgWE1MRG9jdW1lbnRQYXJzZXI6OnBhdXNlUGFyc2luZygpCiAgICAgbV9wYXJz ZXJQYXVzZWQgPSB0cnVlOwogfQogCitib29sIFhNTERvY3VtZW50UGFyc2VyOjpwYXJzZURvY3Vt ZW50RnJhZ21lbnQoY29uc3QgU3RyaW5nJiBjaHVuaywgRG9jdW1lbnRGcmFnbWVudCogZnJhZ21l bnQsIEVsZW1lbnQqIGNvbnRleHRFbGVtZW50LCBGcmFnbWVudFNjcmlwdGluZ1Blcm1pc3Npb24g c2NyaXB0aW5nUGVybWlzc2lvbikKK3sKKyAgICBpZiAoIWNodW5rLmxlbmd0aCgpKQorICAgICAg ICByZXR1cm4gdHJ1ZTsKKworICAgIC8vIEZJWE1FOiBXZSBuZWVkIHRvIGltcGxlbWVudCB0aGUg SFRNTDUgWE1MIEZyYWdtZW50IHBhcnNpbmcgYWxnb3JpdGhtOgorICAgIC8vIGh0dHA6Ly93d3cu d2hhdHdnLm9yZy9zcGVjcy93ZWItYXBwcy9jdXJyZW50LXdvcmsvbXVsdGlwYWdlL3RoZS14aHRt bC1zeW50YXguaHRtbCN4bWwtZnJhZ21lbnQtcGFyc2luZy1hbGdvcml0aG0KKyAgICAvLyBGb3Ig bm93IHdlIGhhdmUgYSBoYWNrIGZvciBzY3JpcHQvc3R5bGUgaW5uZXJIVE1MIHN1cHBvcnQ6Cisg ICAgaWYgKGNvbnRleHRFbGVtZW50ICYmIChjb250ZXh0RWxlbWVudC0+aGFzTG9jYWxOYW1lKEhU TUxOYW1lczo6c2NyaXB0VGFnKSB8fCBjb250ZXh0RWxlbWVudC0+aGFzTG9jYWxOYW1lKEhUTUxO YW1lczo6c3R5bGVUYWcpKSkgeworICAgICAgICBmcmFnbWVudC0+cGFyc2VyQWRkQ2hpbGQoZnJh Z21lbnQtPmRvY3VtZW50KCktPmNyZWF0ZVRleHROb2RlKGNodW5rKSk7CisgICAgICAgIHJldHVy biB0cnVlOworICAgIH0KKworICAgIFJlZlB0cjxYTUxEb2N1bWVudFBhcnNlcj4gcGFyc2VyID0g WE1MRG9jdW1lbnRQYXJzZXI6OmNyZWF0ZShmcmFnbWVudCwgY29udGV4dEVsZW1lbnQsIHNjcmlw dGluZ1Blcm1pc3Npb24pOworICAgIGJvb2wgd2VsbEZvcm1lZCA9IHBhcnNlci0+YXBwZW5kRnJh Z21lbnRTb3VyY2UoY2h1bmspOworICAgIC8vIERvIG5vdCBjYWxsIGZpbmlzaCgpLiAgQ3VycmVu dCBmaW5pc2goKSBhbmQgZG9FbmQoKSBpbXBsZW1lbnRhdGlvbnMgdG91Y2ggdGhlIG1haW4gRG9j dW1lbnQvbG9hZGVyCisgICAgLy8gYW5kIGNhbiBjYXVzZSBjcmFzaGVzIGluIHRoZSBmcmFnbWVu dCBjYXNlLgorICAgIHBhcnNlci0+ZGV0YWNoKCk7IC8vIEFsbG93cyB+RG9jdW1lbnRQYXJzZXIg dG8gYXNzZXJ0IGl0IHdhcyBkZXRhY2hlZCBiZWZvcmUgZGVzdHJ1Y3Rpb24uCisgICAgcmV0dXJu IHdlbGxGb3JtZWQ7IC8vIGFwcGVuZEZyYWdtZW50U291cmNlKCkncyB3ZWxsRm9ybWVkIGlzIG1v cmUgcGVybWlzc2l2ZSB0aGFuIHdlbGxGb3JtZWQoKS4KIH0KKworfSAvLyBuYW1lc3BhY2UgV2Vi Q29yZQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9kb20vWE1MRG9jdW1lbnRQYXJzZXIuaCBiL1dlYkNv cmUvZG9tL1hNTERvY3VtZW50UGFyc2VyLmgKaW5kZXggY2RjNzcwZWE2ZWRkNDM5YTY1NjdlOWRh YjQxNTc2MDZiYWRhYTMzZi4uMzliYmNkOTFjZDUxYWM2MDU2YTY4ZTBmMGFlY2I4N2E1YzU4ZDlh ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9kb20vWE1MRG9jdW1lbnRQYXJzZXIuaAorKysgYi9XZWJD b3JlL2RvbS9YTUxEb2N1bWVudFBhcnNlci5oCkBAIC05Nyw3ICs5Nyw3IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICAgICAgYm9vbCBpc1dNTERvY3VtZW50KCkgY29uc3Q7CiAjZW5kaWYKIAot ICAgIHN0YXRpYyBib29sIHBhcnNlRG9jdW1lbnRGcmFnbWVudChjb25zdCBTdHJpbmcmLCBEb2N1 bWVudEZyYWdtZW50KiwgRWxlbWVudCogcGFyZW50ID0gMCwgRnJhZ21lbnRTY3JpcHRpbmdQZXJt aXNzaW9uID0gRnJhZ21lbnRTY3JpcHRpbmdBbGxvd2VkKTsKKyAgICAgICAgc3RhdGljIGJvb2wg cGFyc2VEb2N1bWVudEZyYWdtZW50KGNvbnN0IFN0cmluZyYsIERvY3VtZW50RnJhZ21lbnQqLCBF bGVtZW50KiBwYXJlbnQgPSAwLCBGcmFnbWVudFNjcmlwdGluZ1Blcm1pc3Npb24gPSBGcmFnbWVu dFNjcmlwdGluZ0FsbG93ZWQpOwogCiAgICAgICAgIC8vIFdNTEVycm9ySGFuZGxpbmcgdXNlcyB0 aGVzZSBmdW5jdGlvbnMuCiAgICAgICAgIHZpcnR1YWwgYm9vbCB3ZWxsRm9ybWVkKCkgY29uc3Qg eyByZXR1cm4gIW1fc2F3RXJyb3I7IH0KQEAgLTEyNCw2ICsxMjQsOCBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAgICAgICAgIHZvaWQgcGF1c2VQYXJzaW5nKCk7CiAgICAgICAgIHZvaWQgcmVzdW1l UGFyc2luZygpOwogCisgICAgICAgIGJvb2wgYXBwZW5kRnJhZ21lbnRTb3VyY2UoY29uc3QgU3Ry aW5nJik7CisKICNpZiBVU0UoUVhNTFNUUkVBTSkKIHByaXZhdGU6CiAgICAgICAgIHZvaWQgcGFy c2UoKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9tL1hNTERvY3VtZW50UGFyc2VyTGlieG1sMi5j cHAgYi9XZWJDb3JlL2RvbS9YTUxEb2N1bWVudFBhcnNlckxpYnhtbDIuY3BwCmluZGV4IDg2MTg1 M2M1ZGVmNjYxMWNkZDE2ODlkYjIyZjgwNmE3NDU2ZTJiMzAuLjQ0NGVkYzUwNWU1Nzc4NDgzOGJm ZTY0NmYxMDBlMjUyZGVkZjdhMTAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL1hNTERvY3VtZW50 UGFyc2VyTGlieG1sMi5jcHAKKysrIGIvV2ViQ29yZS9kb20vWE1MRG9jdW1lbnRQYXJzZXJMaWJ4 bWwyLmNwcApAQCAtMTI3NCw4ICsxMjc0LDEwIEBAIHZvaWQgWE1MRG9jdW1lbnRQYXJzZXI6Omlu aXRpYWxpemVQYXJzZXJDb250ZXh0KGNvbnN0IGNoYXIqIGNodW5rKQogICAgIFhNTERvY3VtZW50 UGFyc2VyU2NvcGUgc2NvcGUoZG9jdW1lbnQoKS0+ZG9jTG9hZGVyKCkpOwogICAgIGlmIChtX3Bh cnNpbmdGcmFnbWVudCkKICAgICAgICAgbV9jb250ZXh0ID0gWE1MUGFyc2VyQ29udGV4dDo6Y3Jl YXRlTWVtb3J5UGFyc2VyKCZzYXgsIHRoaXMsIGNodW5rKTsKLSAgICBlbHNlCisgICAgZWxzZSB7 CisgICAgICAgIEFTU0VSVCghY2h1bmspOwogICAgICAgICBtX2NvbnRleHQgPSBYTUxQYXJzZXJD b250ZXh0OjpjcmVhdGVTdHJpbmdQYXJzZXIoJnNheCwgdGhpcyk7CisgICAgfQogfQogCiB2b2lk IFhNTERvY3VtZW50UGFyc2VyOjpkb0VuZCgpCkBAIC0xMzcxLDMxICsxMzczLDI5IEBAIHZvaWQg WE1MRG9jdW1lbnRQYXJzZXI6OnJlc3VtZVBhcnNpbmcoKQogICAgICAgICBlbmQoKTsKIH0KIAot Ly8gRklYTUU6IFRoaXMgbWV0aG9kIHNob3VsZCBiZSBwb3NzaWJsZSB0byBpbXBsZW1lbnQgdXNp bmcgdGhlIERvY3VtZW50UGFyc2VyCi0vLyBBUEksIGluc3RlYWQgb2YgbmVlZGluZyB0byBncmFi IGF0IGxpYnhtbDIgc3RhdGUgZGlyZWN0bHkuCi1ib29sIFhNTERvY3VtZW50UGFyc2VyOjpwYXJz ZURvY3VtZW50RnJhZ21lbnQoY29uc3QgU3RyaW5nJiBjaHVuaywgRG9jdW1lbnRGcmFnbWVudCog ZnJhZ21lbnQsIEVsZW1lbnQqIHBhcmVudCwgRnJhZ21lbnRTY3JpcHRpbmdQZXJtaXNzaW9uIHNj cmlwdGluZ1Blcm1pc3Npb24pCitib29sIFhNTERvY3VtZW50UGFyc2VyOjphcHBlbmRGcmFnbWVu dFNvdXJjZShjb25zdCBTdHJpbmcmIGNodW5rKQogewotICAgIGlmICghY2h1bmsubGVuZ3RoKCkp Ci0gICAgICAgIHJldHVybiB0cnVlOwotCi0gICAgUmVmUHRyPFhNTERvY3VtZW50UGFyc2VyPiBw YXJzZXIgPSBYTUxEb2N1bWVudFBhcnNlcjo6Y3JlYXRlKGZyYWdtZW50LCBwYXJlbnQsIHNjcmlw dGluZ1Blcm1pc3Npb24pOworICAgIEFTU0VSVCghbV9jb250ZXh0KTsKKyAgICBBU1NFUlQobV9w YXJzaW5nRnJhZ21lbnQpOwogCiAgICAgQ1N0cmluZyBjaHVua0FzVXRmOCA9IGNodW5rLnV0Zjgo KTsKLSAgICBwYXJzZXItPmluaXRpYWxpemVQYXJzZXJDb250ZXh0KGNodW5rQXNVdGY4LmRhdGEo KSk7Ci0KLSAgICB4bWxQYXJzZUNvbnRlbnQocGFyc2VyLT5jb250ZXh0KCkpOwotCi0gICAgcGFy c2VyLT5lbmREb2N1bWVudCgpOworICAgIGluaXRpYWxpemVQYXJzZXJDb250ZXh0KGNodW5rQXNV dGY4LmRhdGEoKSk7CisgICAgeG1sUGFyc2VDb250ZW50KGNvbnRleHQoKSk7CisgICAgZW5kRG9j dW1lbnQoKTsgLy8gQ2xvc2UgYW55IG9wZW4gdGV4dCBub2Rlcy4KIAorICAgIC8vIEZJWE1FOiBJ ZiB0aGlzIGNvZGUgaXMgYWN0dWFsbHkgbmVlZGVkLCBpdCBzaG91bGQgcHJvYmFibHkgbW92ZSB0 byBmaW5pc2goKQorICAgIC8vIFhNTERvY3VtZW50UGFyc2VyUXQgaGFzIGEgc2ltaWxhciBjaGVj ayAobV9zdHJlYW0uZXJyb3IoKSA9PSBRWG1sU3RyZWFtUmVhZGVyOjpQcmVtYXR1cmVFbmRPZkRv Y3VtZW50RXJyb3IpIGluIGRvRW5kKCkuCiAgICAgLy8gQ2hlY2sgaWYgYWxsIHRoZSBjaHVuayBo YXMgYmVlbiBwcm9jZXNzZWQuCi0gICAgbG9uZyBieXRlc1Byb2Nlc3NlZCA9IHhtbEJ5dGVDb25z dW1lZChwYXJzZXItPmNvbnRleHQoKSk7Ci0gICAgaWYgKGJ5dGVzUHJvY2Vzc2VkID09IC0xIHx8 ICgodW5zaWduZWQgbG9uZylieXRlc1Byb2Nlc3NlZCkgIT0gY2h1bmtBc1V0ZjgubGVuZ3RoKCkp CisgICAgbG9uZyBieXRlc1Byb2Nlc3NlZCA9IHhtbEJ5dGVDb25zdW1lZChjb250ZXh0KCkpOwor ICAgIGlmIChieXRlc1Byb2Nlc3NlZCA9PSAtMSB8fCAoKHVuc2lnbmVkIGxvbmcpYnl0ZXNQcm9j ZXNzZWQpICE9IGNodW5rQXNVdGY4Lmxlbmd0aCgpKSB7CisgICAgICAgIC8vIEZJWE1FOiBJIGRv bid0IGJlbGlldmUgd2UgY2FuIGhpdCB0aGlzIGNhc2Ugd2l0aG91dCBhbHNvIGhhdmluZyBzZWVu IGFuIGVycm9yLgorICAgICAgICAvLyBJZiB3ZSBoaXQgdGhpcyBBU1NFUlQsIHdlJ3ZlIGZvdW5k IGEgdGVzdCBjYXNlIHdoaWNoIGRlbW9uc3RyYXRlcyB0aGUgbmVlZCBmb3IgdGhpcyBjb2RlLgor ICAgICAgICBBU1NFUlQobV9zYXdFcnJvcik7CiAgICAgICAgIHJldHVybiBmYWxzZTsKLQotICAg IHBhcnNlci0+ZGV0YWNoKCk7IC8vIEFsbG93cyB+RG9jdW1lbnRQYXJzZXIgdG8gYXNzZXJ0IGl0 IHdhcyBkZXRhY2hlZCBiZWZvcmUgZGVzdHJ1Y3Rpb24uCisgICAgfQogCiAgICAgLy8gTm8gZXJy b3IgaWYgdGhlIGNodW5rIGlzIHdlbGwgZm9ybWVkIG9yIGl0IGlzIG5vdCBidXQgd2UgaGF2ZSBu byBlcnJvci4KLSAgICByZXR1cm4gcGFyc2VyLT5jb250ZXh0KCktPndlbGxGb3JtZWQgfHwgIXht bEN0eHRHZXRMYXN0RXJyb3IocGFyc2VyLT5jb250ZXh0KCkpOworICAgIHJldHVybiBjb250ZXh0 KCktPndlbGxGb3JtZWQgfHwgIXhtbEN0eHRHZXRMYXN0RXJyb3IoY29udGV4dCgpKTsKIH0KIAog Ly8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KZGlmZiAtLWdpdCBhL1dlYkNvcmUv ZG9tL1hNTERvY3VtZW50UGFyc2VyUXQuY3BwIGIvV2ViQ29yZS9kb20vWE1MRG9jdW1lbnRQYXJz ZXJRdC5jcHAKaW5kZXggMTQ4Y2ZmMGM1M2RlYTEwYWQzOTRjMDZlYjkwNmM2ODJjOGU1NDYwMi4u MTE1YTNlOWYwY2Y2MmRjNjVlYjA5N2M4ZDM3YWI4ODA0YTM1MWZjMSAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9kb20vWE1MRG9jdW1lbnRQYXJzZXJRdC5jcHAKKysrIGIvV2ViQ29yZS9kb20vWE1MRG9j dW1lbnRQYXJzZXJRdC5jcHAKQEAgLTI1NCwxOSArMjU0LDEzIEBAIHZvaWQgWE1MRG9jdW1lbnRQ YXJzZXI6OnJlc3VtZVBhcnNpbmcoKQogICAgICAgICBlbmQoKTsKIH0KIAotYm9vbCBYTUxEb2N1 bWVudFBhcnNlcjo6cGFyc2VEb2N1bWVudEZyYWdtZW50KGNvbnN0IFN0cmluZyYgY2h1bmssIERv Y3VtZW50RnJhZ21lbnQqIGZyYWdtZW50LCBFbGVtZW50KiBwYXJlbnQsIEZyYWdtZW50U2NyaXB0 aW5nUGVybWlzc2lvbiBzY3JpcHRpbmdQZXJtaXNzaW9uKQorYm9vbCBYTUxEb2N1bWVudFBhcnNl cjo6YXBwZW5kRnJhZ21lbnRTb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2UpCiB7Ci0gICAgaWYg KCFjaHVuay5sZW5ndGgoKSkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0KLSAgICBSZWZQdHI8WE1M RG9jdW1lbnRQYXJzZXI+IHBhcnNlciA9IFhNTERvY3VtZW50UGFyc2VyOjpjcmVhdGUoZnJhZ21l bnQsIHBhcmVudCwgc2NyaXB0aW5nUGVybWlzc2lvbik7Ci0KLSAgICBwYXJzZXItPmFwcGVuZChT dHJpbmcoIjxxeG1sc3RyZWFtZHVtbXllbGVtZW50PiIpKTsKLSAgICBwYXJzZXItPmFwcGVuZChj aHVuayk7Ci0gICAgcGFyc2VyLT5hcHBlbmQoU3RyaW5nKCI8L3F4bWxzdHJlYW1kdW1teWVsZW1l bnQ+IikpOwotICAgIHBhcnNlci0+ZmluaXNoKCk7Ci0gICAgcGFyc2VyLT5kZXRhY2goKTsgLy8g QWxsb3dzIH5Eb2N1bWVudFBhcnNlciB0byBhc3NlcnQgaXQgd2FzIGRldGFjaGVkIGJlZm9yZSBk ZXN0cnVjdGlvbi4KLSAgICByZXR1cm4gIXBhcnNlci0+aGFzRXJyb3IoKTsKKyAgICBBU1NFUlQo IW1fc2F3Rmlyc3RFbGVtZW50KTsKKyAgICBhcHBlbmQoU3RyaW5nKCI8cXhtbHN0cmVhbWR1bW15 ZWxlbWVudD4iKSk7CisgICAgYXBwZW5kKHNvdXJjZSk7CisgICAgYXBwZW5kKFN0cmluZygiPC9x eG1sc3RyZWFtZHVtbXllbGVtZW50PiIpKTsKKyAgICByZXR1cm4gIWhhc0Vycm9yKCk7CiB9CiAK IC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCg==