59304 2011-04-24 12:15:50 -0700 Crash when adding a text node to a shadow root 2011-04-24 16:07:04 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 59306 52962 0 dominicc webkit-unassigned abarth commit-queue dglazkov webkit.review.bot oldest_to_newest 391616 0 dominicc 2011-04-24 12:15:50 -0700 Adding a text node to a shadow root crashes; it should instead present the text in the shadow DOM. 391618 1 90885 dominicc 2011-04-24 12:32:44 -0700 Created attachment 90885 Patch 391622 2 webkit.review.bot 2011-04-24 12:53:02 -0700 Attachment 90885 did not pass chromium-ews: Output: http://queues.webkit.org/results/8507105 Unexpected failures: fast/dom/shadow/gc-shadow.html fast/dom/shadow/append-child-text.html 391623 3 dominicc 2011-04-24 13:07:28 -0700 I’m setting up a Linux build environment to investigate the cr-linux EWS failures. I don’t know why fast/dom/shadow/append-child-text.html is an unexpected failure… the linked log output indicates that it passed :/ 391624 4 dominicc 2011-04-24 13:08:08 -0700 s/append-child-text/gc-shadow/ 391626 5 abarth 2011-04-24 13:20:41 -0700 (In reply to comment #4) > s/append-child-text/gc-shadow/ Hum... Interesting. Running tests on the EWS is still very experimental. I wouldn't be surprised of there were some bugs. 391627 6 dglazkov 2011-04-24 13:24:05 -0700 (In reply to comment #3) > I’m setting up a Linux build environment to investigate the cr-linux EWS failures. I don’t know why fast/dom/shadow/append-child-text.html is an unexpected failure… the linked log output indicates that it passed :/ I don't think you need a Linux env to test this. There's nothing Linuxey about this code. 391628 7 90885 dglazkov 2011-04-24 13:30:53 -0700 Comment on attachment 90885 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=90885&action=review > LayoutTests/fast/dom/shadow/append-child-text-expected.txt:13 > + text run at (0,0) width 39: "PASS" Can this test be dumpAsText? 391629 8 90885 dominicc 2011-04-24 13:32:26 -0700 Comment on attachment 90885 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=90885&action=review >> LayoutTests/fast/dom/shadow/append-child-text-expected.txt:13 >> + text run at (0,0) width 39: "PASS" > > Can this test be dumpAsText? No, because shadow DOM is not dumped as text. That it doesn’t crash is observable, but that the text appears is not observable with a text result. WDYT? 391630 9 dominicc 2011-04-24 13:33:35 -0700 cr-linux’s complaint is probably the lack of pixel test results. 391631 10 dglazkov 2011-04-24 13:34:43 -0700 (In reply to comment #9) > cr-linux’s complaint is probably the lack of pixel test results. Yes, and it will need its own expectations due to text metric differences. Let's make this a dumpAsText. Perhaps event file a bug to teach the dumper about shadow DOM. 391633 11 90886 dominicc 2011-04-24 13:44:31 -0700 Created attachment 90886 Patch 391634 12 90886 dglazkov 2011-04-24 13:45:49 -0700 Comment on attachment 90886 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=90886&action=review the only nit remaining: > LayoutTests/fast/dom/shadow/append-child-text.html:4 > +<script src="../../js/resources/js-test-pre.js"></script> don't really need the harness for this test. 391636 13 90887 dominicc 2011-04-24 13:55:51 -0700 Created attachment 90887 Patch 391638 14 dominicc 2011-04-24 14:00:43 -0700 For the fossil record: filed bug 59305 for adding text in shadow DOM to layout test text output. 391639 15 webkit.review.bot 2011-04-24 14:15:10 -0700 Attachment 90887 did not pass chromium-ews: Output: http://queues.webkit.org/results/8504488 Unexpected failures: fast/dom/shadow/gc-shadow.html 391640 16 90887 commit-queue 2011-04-24 14:20:53 -0700 Comment on attachment 90887 Patch Clearing flags on attachment: 90887 Committed r84759: <http://trac.webkit.org/changeset/84759> 391641 17 commit-queue 2011-04-24 14:20:58 -0700 All reviewed patches have been landed. Closing bug. 391650 18 dglazkov 2011-04-24 16:02:28 -0700 (In reply to comment #2) > Attachment 90885 [details] did not pass chromium-ews: > Output: http://queues.webkit.org/results/8507105 > Unexpected failures: > fast/dom/shadow/gc-shadow.html > fast/dom/shadow/append-child-text.html EWS, you were right. gc-shadow is now crashing on canaries. Dominic, Adam, can you rollout on #webkit? 90885 2011-04-24 12:32:44 -0700 2011-04-24 13:44:27 -0700 Patch bug-59304-20110424123243.patch text/plain 5553 dominicc U3VidmVyc2lvbiBSZXZpc2lvbjogODQ3NTYKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjZDdkMWZhMzkwZDI3Zjc5MjkyZWZk ZDcwZjdmMzllMjA2MDE4YjdmLi5hMzFmNGRkZGM4ZWQzYzNiNWJmYTk3ODRlMGQyNDdkZDY0NzZh YWEwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDQtMjQgIERvbWluaWMgQ29vbmV5ICA8 ZG9taW5pY2NAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIENyYXNoIHdoZW4gYWRkaW5nIGEgdGV4dCBub2RlIHRvIGEgc2hhZG93 IHJvb3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU5 MzA0CisKKyAgICAgICAgKiBmYXN0L2RvbS9zaGFkb3cvYXBwZW5kLWNoaWxkLXRleHQtZXhwZWN0 ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2RvbS9zaGFkb3cvYXBwZW5kLWNoaWxkLXRl eHQuaHRtbDogQWRkZWQuCisKIDIwMTEtMDQtMjQgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0 Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYWNpZWogU3RhY2hvd2lhay4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3QvZG9tL3NoYWRvdy9hcHBlbmQtY2hpbGQtdGV4dC1leHBlY3Rl ZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9zaGFkb3cvYXBwZW5kLWNoaWxkLXRleHQtZXhw ZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLmU0MDUzNjIxOTdlMTRhNmY4YTlkY2JhNmQ3NjMwMTg3NmRm ZDMxNDAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9zaGFkb3cvYXBw ZW5kLWNoaWxkLXRleHQtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTMgQEAKK2xheWVyIGF0ICgw LDApIHNpemUgODAweDYwMAorICBSZW5kZXJWaWV3IGF0ICgwLDApIHNpemUgODAweDYwMAorbGF5 ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4OTMKKyAgUmVuZGVyQmxvY2sge0hUTUx9IGF0ICgwLDApIHNp emUgODAweDkzCisgICAgUmVuZGVyQm9keSB7Qk9EWX0gYXQgKDgsMTMpIHNpemUgNzg0eDY0Cisg ICAgICBSZW5kZXJCbG9jayB7UFJFfSBhdCAoMCwwKSBzaXplIDc4NHgzMAorICAgICAgICBSZW5k ZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSA0NTZ4MzAKKyAgICAgICAgICB0ZXh0IHJ1biBh dCAoMCwwKSB3aWR0aCA0NTY6ICJUaGlzIHRlc3RzIHRoYXQgdGV4dCBub2RlcyBhcmUgcmVuZGVy ZWQgaW4gYSBzaGFkb3cgcm9vdC4iCisgICAgICAgICAgdGV4dCBydW4gYXQgKDQ1NiwwKSB3aWR0 aCAwOiAiICIKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwxNSkgd2lkdGggMDogIiAiCisgICAg ICBSZW5kZXJCbG9jayB7UH0gYXQgKDAsNDYpIHNpemUgNzg0eDE4CisgICAgICAgIFJlbmRlclRl eHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDM5eDE4CisgICAgICAgICAgdGV4dCBydW4gYXQgKDAs MCkgd2lkdGggMzk6ICJQQVNTIgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9kb20vc2hh ZG93L2FwcGVuZC1jaGlsZC10ZXh0Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9zaGFkb3cv YXBwZW5kLWNoaWxkLXRleHQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5mNzg2YmE2NTM4MDA0N2M3MmFhYzU4 ZmUyYjJmNTVjZWZjOTU1NWNhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9k b20vc2hhZG93L2FwcGVuZC1jaGlsZC10ZXh0Lmh0bWwKQEAgLTAsMCArMSwxNCBAQAorPCFET0NU WVBFIGh0bWw+Cis8cHJlIGlkPSJjb25zb2xlIj4KK1RoaXMgdGVzdHMgdGhhdCB0ZXh0IG5vZGVz IGFyZSByZW5kZXJlZCBpbiBhIHNoYWRvdyByb290LgorCis8L3ByZT4KKzxwIGlkPSJwIj48L3A+ Cis8c2NyaXB0PgoraWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikgeworICAgIHZhciBw ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3AnKTsKKyAgICB2YXIgc2hhZG93ID0gbGF5b3V0 VGVzdENvbnRyb2xsZXIuZW5zdXJlU2hhZG93Um9vdChwKTsKKyAgICB2YXIgdGV4dCA9IGRvY3Vt ZW50LmNyZWF0ZVRleHROb2RlKCdQQVNTJyk7CisgICAgc2hhZG93LmFwcGVuZENoaWxkKHRleHQp OworfQorPC9zY3JpcHQ+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjMwYTYxYjMzOTRkZWIwNDc4ZjI5OTgxNTNl OWM4NzRlNGIwMGEyMC4uNDJhZjAzMTAxMjk0MmQ4Yzc2MGUzMmFjOTljOGRlZjNhMDdlOWFhOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDExLTA0LTI0ICBEb21pbmljIENvb25leSAg PGRvbWluaWNjQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBDcmFzaCB3aGVuIGFkZGluZyBhIHRleHQgbm9kZSB0byBhIHNoYWRv dyByb290CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 OTMwNAorCisgICAgICAgIFRleHQgbm9kZXMgbmVlZCB0byBjb25zdWx0IHRoZWlyIGhvc3QgZWxl bWVudCBmb3Igc3R5bGUuCisKKyAgICAgICAgVGVzdDogZmFzdC9kb20vc2hhZG93L2FwcGVuZC1j aGlsZC10ZXh0Lmh0bWwKKworICAgICAgICAqIGRvbS9Ob2RlLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Ok5vZGVSZW5kZXJlckZhY3Rvcnk6OnN0eWxlRm9yUmVuZGVyZXIpOgorICAgICAgICAoV2Vi Q29yZTo6Tm9kZVJlbmRlcmVyRmFjdG9yeTo6Y3JlYXRlUmVuZGVyZXJBbmRTdHlsZSk6CisgICAg ICAgIChXZWJDb3JlOjpOb2RlOjpzdHlsZUZvclJlbmRlcmVyKTogZm9yd2FyZCB0byBOb2RlUmVu ZGVyZXJGYWN0b3J5CisKIDIwMTEtMDQtMjQgIFJpayBDYWJhbmllciAgPGNhYmFuaWVyQGFkb2Jl LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAK aW5kZXggNTU1YmMzM2MzZDliZTgxOWQxZjZiMDZlYTcwNWM3ZDkzNjlmYzZhNC4uZjdiY2I3MTk3 MzlmZmVhODZiZGM3YmY3NjEzYjY4YmU1ZTVjYzI5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvZG9tL05vZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcApAQCAtMTQ4 Myw2ICsxNDgzLDcgQEAgcHVibGljOgogICAKICAgICBDb250YWluZXJOb2RlKiBwYXJlbnROb2Rl Rm9yUmVuZGVyaW5nQW5kU3R5bGUoKSBjb25zdCB7IHJldHVybiBtX3BhcmVudE5vZGVGb3JSZW5k ZXJpbmdBbmRTdHlsZTsgfQogICAgIHZvaWQgY3JlYXRlUmVuZGVyZXJJZk5lZWRlZCgpOworICAg IFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IHN0eWxlRm9yUmVuZGVyZXIoKTsKIAogcHJpdmF0ZToK ICAgICBEb2N1bWVudCogZG9jdW1lbnQoKSB7IHJldHVybiBtX25vZGUtPmRvY3VtZW50KCk7IH0K QEAgLTE0OTcsNiArMTQ5OCwyMCBAQCBwcml2YXRlOgogICAgIFNoYWRvd1Jvb3QqIG1fdmlzdWFs UGFyZW50U2hhZG93Um9vdDsKIH07CiAKK1Bhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IE5vZGVSZW5k ZXJlckZhY3Rvcnk6OnN0eWxlRm9yUmVuZGVyZXIoKQoreworICAgIGlmIChtX25vZGUtPmlzRWxl bWVudE5vZGUoKSkgeworICAgICAgICBib29sIGFsbG93U2hhcmluZyA9IHRydWU7CisjaWYgRU5B QkxFKFhIVE1MTVApCisgICAgICAgIC8vIG5vc2NyaXB0IG5lZWRzIHRoZSBkaXNwbGF5IHByb3Bl cnR5IHByb3RlY3RlZCAtIGl0J3MgYSBzcGVjaWFsIGNhc2UKKyAgICAgICAgYWxsb3dTaGFyaW5n ID0gbV9ub2RlLT5sb2NhbE5hbWUoKSAhPSBIVE1MTmFtZXM6Om5vc2NyaXB0VGFnLmxvY2FsTmFt ZSgpOworI2VuZGlmCisgICAgICAgIHJldHVybiBtX25vZGUtPmRvY3VtZW50KCktPnN0eWxlU2Vs ZWN0b3IoKS0+c3R5bGVGb3JFbGVtZW50KHN0YXRpY19jYXN0PEVsZW1lbnQqPihtX25vZGUpLCAw LCBhbGxvd1NoYXJpbmcpOworICAgIH0KKyAgICBDb250YWluZXJOb2RlKiBwYXJlbnROb2RlRm9y U3R5bGUgPSBwYXJlbnROb2RlRm9yUmVuZGVyaW5nQW5kU3R5bGUoKTsKKyAgICByZXR1cm4gcGFy ZW50Tm9kZUZvclN0eWxlICYmIHBhcmVudE5vZGVGb3JTdHlsZS0+cmVuZGVyZXIoKSA/IHBhcmVu dE5vZGVGb3JTdHlsZS0+cmVuZGVyZXIoKS0+c3R5bGUoKSA6IDA7Cit9CisKIENvbnRhaW5lck5v ZGUqIE5vZGVSZW5kZXJlckZhY3Rvcnk6OmZpbmRWaXN1YWxQYXJlbnQoKQogewogICAgIENvbnRh aW5lck5vZGUqIHBhcmVudCA9IG1fbm9kZS0+cGFyZW50T3JIb3N0Tm9kZSgpOwpAQCAtMTU1Niw3 ICsxNTcxLDcgQEAgUmVuZGVyT2JqZWN0KiBOb2RlUmVuZGVyZXJGYWN0b3J5OjpjcmVhdGVSZW5k ZXJlckFuZFN0eWxlKCkKICAgICBpZiAoIXNob3VsZENyZWF0ZVJlbmRlcmVyKCkpCiAgICAgICAg IHJldHVybiAwOwogCi0gICAgUmVmUHRyPFJlbmRlclN0eWxlPiBzdHlsZSA9IG1fbm9kZS0+c3R5 bGVGb3JSZW5kZXJlcigpOworICAgIFJlZlB0cjxSZW5kZXJTdHlsZT4gc3R5bGUgPSBzdHlsZUZv clJlbmRlcmVyKCk7CiAgICAgaWYgKCFtX25vZGUtPnJlbmRlcmVySXNOZWVkZWQoc3R5bGUuZ2V0 KCkpKQogICAgICAgICByZXR1cm4gMDsKIApAQCAtMTYyMSwxNSArMTYzNiw3IEBAIHZvaWQgTm9k ZTo6Y3JlYXRlUmVuZGVyZXJJZk5lZWRlZCgpCiAKIFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IE5v ZGU6OnN0eWxlRm9yUmVuZGVyZXIoKQogewotICAgIGlmIChpc0VsZW1lbnROb2RlKCkpIHsKLSAg ICAgICAgYm9vbCBhbGxvd1NoYXJpbmcgPSB0cnVlOwotI2lmIEVOQUJMRShYSFRNTE1QKQotICAg ICAgICAvLyBub3NjcmlwdCBuZWVkcyB0aGUgZGlzcGxheSBwcm9wZXJ0eSBwcm90ZWN0ZWQgLSBp dCdzIGEgc3BlY2lhbCBjYXNlCi0gICAgICAgIGFsbG93U2hhcmluZyA9IGxvY2FsTmFtZSgpICE9 IEhUTUxOYW1lczo6bm9zY3JpcHRUYWcubG9jYWxOYW1lKCk7Ci0jZW5kaWYKLSAgICAgICAgcmV0 dXJuIGRvY3VtZW50KCktPnN0eWxlU2VsZWN0b3IoKS0+c3R5bGVGb3JFbGVtZW50KHN0YXRpY19j YXN0PEVsZW1lbnQqPih0aGlzKSwgMCwgYWxsb3dTaGFyaW5nKTsKLSAgICB9Ci0gICAgcmV0dXJu IHBhcmVudE5vZGUoKSAmJiBwYXJlbnROb2RlKCktPnJlbmRlcmVyKCkgPyBwYXJlbnROb2RlKCkt PnJlbmRlcmVyKCktPnN0eWxlKCkgOiAwOworICAgIHJldHVybiBOb2RlUmVuZGVyZXJGYWN0b3J5 KHRoaXMpLnN0eWxlRm9yUmVuZGVyZXIoKTsKIH0KIAogYm9vbCBOb2RlOjpyZW5kZXJlcklzTmVl ZGVkKFJlbmRlclN0eWxlICpzdHlsZSkK 90886 2011-04-24 13:44:31 -0700 2011-04-24 13:55:45 -0700 Patch bug-59304-20110424134430.patch text/plain 5294 dominicc U3VidmVyc2lvbiBSZXZpc2lvbjogODQ3NTYKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjZDdkMWZhMzkwZDI3Zjc5MjkyZWZk ZDcwZjdmMzllMjA2MDE4YjdmLi5hMzFmNGRkZGM4ZWQzYzNiNWJmYTk3ODRlMGQyNDdkZDY0NzZh YWEwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDQtMjQgIERvbWluaWMgQ29vbmV5ICA8 ZG9taW5pY2NAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIENyYXNoIHdoZW4gYWRkaW5nIGEgdGV4dCBub2RlIHRvIGEgc2hhZG93 IHJvb3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU5 MzA0CisKKyAgICAgICAgKiBmYXN0L2RvbS9zaGFkb3cvYXBwZW5kLWNoaWxkLXRleHQtZXhwZWN0 ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2RvbS9zaGFkb3cvYXBwZW5kLWNoaWxkLXRl eHQuaHRtbDogQWRkZWQuCisKIDIwMTEtMDQtMjQgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0 Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYWNpZWogU3RhY2hvd2lhay4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3QvZG9tL3NoYWRvdy9hcHBlbmQtY2hpbGQtdGV4dC1leHBlY3Rl ZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9zaGFkb3cvYXBwZW5kLWNoaWxkLXRleHQtZXhw ZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLmE4ZGNiZjhmYWQ1ZDk0ZDQzNWIwMjY1NzkwYjYyYzBkNTg4 OGRlNjEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9zaGFkb3cvYXBw ZW5kLWNoaWxkLXRleHQtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNiBAQAorVGhpcyB0ZXN0cyB0 aGF0IGFkZGluZyB0ZXh0IG5vZGVzIHRvIGEgc2hhZG93IHJvb3QgZG9lcyBub3QgY3Jhc2guCisK K1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2RvbS9zaGFkb3cvYXBwZW5kLWNoaWxkLXRleHQuaHRt bCBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL3NoYWRvdy9hcHBlbmQtY2hpbGQtdGV4dC5odG1sCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAuLjVkOGU5NjMyOGM5MWQxZDRiYTI5YWU2NDUzOTdiNjdhZDMzMTNmZjkKLS0tIC9k ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9zaGFkb3cvYXBwZW5kLWNoaWxkLXRl eHQuaHRtbApAQCAtMCwwICsxLDI0IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+ Cis8c2NyaXB0IHNyYz0iLi4vLi4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3Njcmlw dD4KKzwvaGVhZD4KKzxib2R5PgorPHAgaWQ9InAiPjwvcD4KKzxwcmUgaWQ9ImNvbnNvbGUiPgor VGhpcyB0ZXN0cyB0aGF0IGFkZGluZyB0ZXh0IG5vZGVzIHRvIGEgc2hhZG93IHJvb3QgZG9lcyBu b3QgY3Jhc2guCisKKzwvcHJlPgorPHNjcmlwdD4KK2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRy b2xsZXIpIHsKKyAgICB2YXIgcCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdwJyk7CisgICAg dmFyIHNoYWRvdyA9IGxheW91dFRlc3RDb250cm9sbGVyLmVuc3VyZVNoYWRvd1Jvb3QocCk7Cisg ICAgdmFyIHRleHQgPSBkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgnSGVsbG8sIHdvcmxkIScpOwor ICAgIHNoYWRvdy5hcHBlbmRDaGlsZCh0ZXh0KTsKK30KKwordmFyIHN1Y2Nlc3NmdWxseVBhcnNl ZCA9IHRydWU7Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9qcy9yZXNvdXJjZXMvanMt dGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBi MzBhNjFiMzM5NGRlYjA0NzhmMjk5ODE1M2U5Yzg3NGU0YjAwYTIwLi40MmFmMDMxMDEyOTQyZDhj NzYwZTMyYWM5OWM4ZGVmM2EwN2U5YWE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIw MTEtMDQtMjQgIERvbWluaWMgQ29vbmV5ICA8ZG9taW5pY2NAY2hyb21pdW0ub3JnPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENyYXNoIHdoZW4gYWRk aW5nIGEgdGV4dCBub2RlIHRvIGEgc2hhZG93IHJvb3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU5MzA0CisKKyAgICAgICAgVGV4dCBub2RlcyBuZWVk IHRvIGNvbnN1bHQgdGhlaXIgaG9zdCBlbGVtZW50IGZvciBzdHlsZS4KKworICAgICAgICBUZXN0 OiBmYXN0L2RvbS9zaGFkb3cvYXBwZW5kLWNoaWxkLXRleHQuaHRtbAorCisgICAgICAgICogZG9t L05vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZVJlbmRlcmVyRmFjdG9yeTo6c3R5bGVG b3JSZW5kZXJlcik6CisgICAgICAgIChXZWJDb3JlOjpOb2RlUmVuZGVyZXJGYWN0b3J5OjpjcmVh dGVSZW5kZXJlckFuZFN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6OnN0eWxlRm9yUmVu ZGVyZXIpOiBmb3J3YXJkIHRvIE5vZGVSZW5kZXJlckZhY3RvcnkKKwogMjAxMS0wNC0yNCAgUmlr IENhYmFuaWVyICA8Y2FiYW5pZXJAYWRvYmUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNp bW9uIEZyYXNlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAppbmRleCA1NTViYzMzYzNkOWJlODE5ZDFmNmIwNmVh NzA1YzdkOTM2OWZjNmE0Li5mN2JjYjcxOTczOWZmZWE4NmJkYzdiZjc2MTNiNjhiZTVlNWNjMjlm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvZG9tL05vZGUuY3BwCkBAIC0xNDgzLDYgKzE0ODMsNyBAQCBwdWJsaWM6CiAgIAogICAg IENvbnRhaW5lck5vZGUqIHBhcmVudE5vZGVGb3JSZW5kZXJpbmdBbmRTdHlsZSgpIGNvbnN0IHsg cmV0dXJuIG1fcGFyZW50Tm9kZUZvclJlbmRlcmluZ0FuZFN0eWxlOyB9CiAgICAgdm9pZCBjcmVh dGVSZW5kZXJlcklmTmVlZGVkKCk7CisgICAgUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4gc3R5bGVG b3JSZW5kZXJlcigpOwogCiBwcml2YXRlOgogICAgIERvY3VtZW50KiBkb2N1bWVudCgpIHsgcmV0 dXJuIG1fbm9kZS0+ZG9jdW1lbnQoKTsgfQpAQCAtMTQ5Nyw2ICsxNDk4LDIwIEBAIHByaXZhdGU6 CiAgICAgU2hhZG93Um9vdCogbV92aXN1YWxQYXJlbnRTaGFkb3dSb290OwogfTsKIAorUGFzc1Jl ZlB0cjxSZW5kZXJTdHlsZT4gTm9kZVJlbmRlcmVyRmFjdG9yeTo6c3R5bGVGb3JSZW5kZXJlcigp Cit7CisgICAgaWYgKG1fbm9kZS0+aXNFbGVtZW50Tm9kZSgpKSB7CisgICAgICAgIGJvb2wgYWxs b3dTaGFyaW5nID0gdHJ1ZTsKKyNpZiBFTkFCTEUoWEhUTUxNUCkKKyAgICAgICAgLy8gbm9zY3Jp cHQgbmVlZHMgdGhlIGRpc3BsYXkgcHJvcGVydHkgcHJvdGVjdGVkIC0gaXQncyBhIHNwZWNpYWwg Y2FzZQorICAgICAgICBhbGxvd1NoYXJpbmcgPSBtX25vZGUtPmxvY2FsTmFtZSgpICE9IEhUTUxO YW1lczo6bm9zY3JpcHRUYWcubG9jYWxOYW1lKCk7CisjZW5kaWYKKyAgICAgICAgcmV0dXJuIG1f bm9kZS0+ZG9jdW1lbnQoKS0+c3R5bGVTZWxlY3RvcigpLT5zdHlsZUZvckVsZW1lbnQoc3RhdGlj X2Nhc3Q8RWxlbWVudCo+KG1fbm9kZSksIDAsIGFsbG93U2hhcmluZyk7CisgICAgfQorICAgIENv bnRhaW5lck5vZGUqIHBhcmVudE5vZGVGb3JTdHlsZSA9IHBhcmVudE5vZGVGb3JSZW5kZXJpbmdB bmRTdHlsZSgpOworICAgIHJldHVybiBwYXJlbnROb2RlRm9yU3R5bGUgJiYgcGFyZW50Tm9kZUZv clN0eWxlLT5yZW5kZXJlcigpID8gcGFyZW50Tm9kZUZvclN0eWxlLT5yZW5kZXJlcigpLT5zdHls ZSgpIDogMDsKK30KKwogQ29udGFpbmVyTm9kZSogTm9kZVJlbmRlcmVyRmFjdG9yeTo6ZmluZFZp c3VhbFBhcmVudCgpCiB7CiAgICAgQ29udGFpbmVyTm9kZSogcGFyZW50ID0gbV9ub2RlLT5wYXJl bnRPckhvc3ROb2RlKCk7CkBAIC0xNTU2LDcgKzE1NzEsNyBAQCBSZW5kZXJPYmplY3QqIE5vZGVS ZW5kZXJlckZhY3Rvcnk6OmNyZWF0ZVJlbmRlcmVyQW5kU3R5bGUoKQogICAgIGlmICghc2hvdWxk Q3JlYXRlUmVuZGVyZXIoKSkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICBSZWZQdHI8UmVuZGVy U3R5bGU+IHN0eWxlID0gbV9ub2RlLT5zdHlsZUZvclJlbmRlcmVyKCk7CisgICAgUmVmUHRyPFJl bmRlclN0eWxlPiBzdHlsZSA9IHN0eWxlRm9yUmVuZGVyZXIoKTsKICAgICBpZiAoIW1fbm9kZS0+ cmVuZGVyZXJJc05lZWRlZChzdHlsZS5nZXQoKSkpCiAgICAgICAgIHJldHVybiAwOwogCkBAIC0x NjIxLDE1ICsxNjM2LDcgQEAgdm9pZCBOb2RlOjpjcmVhdGVSZW5kZXJlcklmTmVlZGVkKCkKIAog UGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4gTm9kZTo6c3R5bGVGb3JSZW5kZXJlcigpCiB7Ci0gICAg aWYgKGlzRWxlbWVudE5vZGUoKSkgewotICAgICAgICBib29sIGFsbG93U2hhcmluZyA9IHRydWU7 Ci0jaWYgRU5BQkxFKFhIVE1MTVApCi0gICAgICAgIC8vIG5vc2NyaXB0IG5lZWRzIHRoZSBkaXNw bGF5IHByb3BlcnR5IHByb3RlY3RlZCAtIGl0J3MgYSBzcGVjaWFsIGNhc2UKLSAgICAgICAgYWxs b3dTaGFyaW5nID0gbG9jYWxOYW1lKCkgIT0gSFRNTE5hbWVzOjpub3NjcmlwdFRhZy5sb2NhbE5h bWUoKTsKLSNlbmRpZgotICAgICAgICByZXR1cm4gZG9jdW1lbnQoKS0+c3R5bGVTZWxlY3Rvcigp LT5zdHlsZUZvckVsZW1lbnQoc3RhdGljX2Nhc3Q8RWxlbWVudCo+KHRoaXMpLCAwLCBhbGxvd1No YXJpbmcpOwotICAgIH0KLSAgICByZXR1cm4gcGFyZW50Tm9kZSgpICYmIHBhcmVudE5vZGUoKS0+ cmVuZGVyZXIoKSA/IHBhcmVudE5vZGUoKS0+cmVuZGVyZXIoKS0+c3R5bGUoKSA6IDA7CisgICAg cmV0dXJuIE5vZGVSZW5kZXJlckZhY3RvcnkodGhpcykuc3R5bGVGb3JSZW5kZXJlcigpOwogfQog CiBib29sIE5vZGU6OnJlbmRlcmVySXNOZWVkZWQoUmVuZGVyU3R5bGUgKnN0eWxlKQo= 90887 2011-04-24 13:55:51 -0700 2011-04-24 14:20:53 -0700 Patch bug-59304-20110424135550.patch text/plain 5151 dominicc U3VidmVyc2lvbiBSZXZpc2lvbjogODQ3NTYKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjZDdkMWZhMzkwZDI3Zjc5MjkyZWZk ZDcwZjdmMzllMjA2MDE4YjdmLi5hMzFmNGRkZGM4ZWQzYzNiNWJmYTk3ODRlMGQyNDdkZDY0NzZh YWEwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDQtMjQgIERvbWluaWMgQ29vbmV5ICA8 ZG9taW5pY2NAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIENyYXNoIHdoZW4gYWRkaW5nIGEgdGV4dCBub2RlIHRvIGEgc2hhZG93 IHJvb3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU5 MzA0CisKKyAgICAgICAgKiBmYXN0L2RvbS9zaGFkb3cvYXBwZW5kLWNoaWxkLXRleHQtZXhwZWN0 ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2RvbS9zaGFkb3cvYXBwZW5kLWNoaWxkLXRl eHQuaHRtbDogQWRkZWQuCisKIDIwMTEtMDQtMjQgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0 Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYWNpZWogU3RhY2hvd2lhay4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3QvZG9tL3NoYWRvdy9hcHBlbmQtY2hpbGQtdGV4dC1leHBlY3Rl ZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9zaGFkb3cvYXBwZW5kLWNoaWxkLXRleHQtZXhw ZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjliMjNmYjE3ZDRhYTM5NWRlMDBhMjMzOTgxZjM1Y2JkZGU2 ZjFhY2UKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9zaGFkb3cvYXBw ZW5kLWNoaWxkLXRleHQtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMyBAQAorVGhpcyB0ZXN0cyB0 aGF0IGFkZGluZyB0ZXh0IG5vZGVzIHRvIGEgc2hhZG93IHJvb3QgZG9lcyBub3QgY3Jhc2guCisK K1BBU1MKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZG9tL3NoYWRvdy9hcHBlbmQtY2hp bGQtdGV4dC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9kb20vc2hhZG93L2FwcGVuZC1jaGlsZC10 ZXh0Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uNTIwZmE0NDJiOGNjYzAxNTYwN2Q2NzAwOGU5ZjJmMjA4YTFh NTQ3YgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL3NoYWRvdy9hcHBl bmQtY2hpbGQtdGV4dC5odG1sCkBAIC0wLDAgKzEsMTggQEAKKzwhRE9DVFlQRSBodG1sPgorPHAg aWQ9InAiPjwvcD4KKzxwcmUgaWQ9ImNvbnNvbGUiPgorVGhpcyB0ZXN0cyB0aGF0IGFkZGluZyB0 ZXh0IG5vZGVzIHRvIGEgc2hhZG93IHJvb3QgZG9lcyBub3QgY3Jhc2guCisKKzwvcHJlPgorPHNj cmlwdD4KK2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICBsYXlvdXRUZXN0 Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisKKyAgICB2YXIgcCA9IGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCdwJyk7CisgICAgdmFyIHNoYWRvdyA9IGxheW91dFRlc3RDb250cm9sbGVyLmVuc3Vy ZVNoYWRvd1Jvb3QocCk7CisgICAgdmFyIHRleHQgPSBkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgn SGVsbG8sIHdvcmxkIScpOworICAgIHNoYWRvdy5hcHBlbmRDaGlsZCh0ZXh0KTsKKworICAgIGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCdjb25zb2xlJykudGV4dENvbnRlbnQgKz0gJ1BBU1MnOwor fQorPC9zY3JpcHQ+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjMwYTYxYjMzOTRkZWIwNDc4ZjI5OTgxNTNlOWM4 NzRlNGIwMGEyMC4uNDJhZjAzMTAxMjk0MmQ4Yzc2MGUzMmFjOTljOGRlZjNhMDdlOWFhOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDExLTA0LTI0ICBEb21pbmljIENvb25leSAgPGRv bWluaWNjQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBDcmFzaCB3aGVuIGFkZGluZyBhIHRleHQgbm9kZSB0byBhIHNoYWRvdyBy b290CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTMw NAorCisgICAgICAgIFRleHQgbm9kZXMgbmVlZCB0byBjb25zdWx0IHRoZWlyIGhvc3QgZWxlbWVu dCBmb3Igc3R5bGUuCisKKyAgICAgICAgVGVzdDogZmFzdC9kb20vc2hhZG93L2FwcGVuZC1jaGls ZC10ZXh0Lmh0bWwKKworICAgICAgICAqIGRvbS9Ob2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok5vZGVSZW5kZXJlckZhY3Rvcnk6OnN0eWxlRm9yUmVuZGVyZXIpOgorICAgICAgICAoV2ViQ29y ZTo6Tm9kZVJlbmRlcmVyRmFjdG9yeTo6Y3JlYXRlUmVuZGVyZXJBbmRTdHlsZSk6CisgICAgICAg IChXZWJDb3JlOjpOb2RlOjpzdHlsZUZvclJlbmRlcmVyKTogZm9yd2FyZCB0byBOb2RlUmVuZGVy ZXJGYWN0b3J5CisKIDIwMTEtMDQtMjQgIFJpayBDYWJhbmllciAgPGNhYmFuaWVyQGFkb2JlLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vTm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKaW5k ZXggNTU1YmMzM2MzZDliZTgxOWQxZjZiMDZlYTcwNWM3ZDkzNjlmYzZhNC4uZjdiY2I3MTk3Mzlm ZmVhODZiZGM3YmY3NjEzYjY4YmU1ZTVjYzI5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv ZG9tL05vZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcApAQCAtMTQ4Myw2 ICsxNDgzLDcgQEAgcHVibGljOgogICAKICAgICBDb250YWluZXJOb2RlKiBwYXJlbnROb2RlRm9y UmVuZGVyaW5nQW5kU3R5bGUoKSBjb25zdCB7IHJldHVybiBtX3BhcmVudE5vZGVGb3JSZW5kZXJp bmdBbmRTdHlsZTsgfQogICAgIHZvaWQgY3JlYXRlUmVuZGVyZXJJZk5lZWRlZCgpOworICAgIFBh c3NSZWZQdHI8UmVuZGVyU3R5bGU+IHN0eWxlRm9yUmVuZGVyZXIoKTsKIAogcHJpdmF0ZToKICAg ICBEb2N1bWVudCogZG9jdW1lbnQoKSB7IHJldHVybiBtX25vZGUtPmRvY3VtZW50KCk7IH0KQEAg LTE0OTcsNiArMTQ5OCwyMCBAQCBwcml2YXRlOgogICAgIFNoYWRvd1Jvb3QqIG1fdmlzdWFsUGFy ZW50U2hhZG93Um9vdDsKIH07CiAKK1Bhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IE5vZGVSZW5kZXJl ckZhY3Rvcnk6OnN0eWxlRm9yUmVuZGVyZXIoKQoreworICAgIGlmIChtX25vZGUtPmlzRWxlbWVu dE5vZGUoKSkgeworICAgICAgICBib29sIGFsbG93U2hhcmluZyA9IHRydWU7CisjaWYgRU5BQkxF KFhIVE1MTVApCisgICAgICAgIC8vIG5vc2NyaXB0IG5lZWRzIHRoZSBkaXNwbGF5IHByb3BlcnR5 IHByb3RlY3RlZCAtIGl0J3MgYSBzcGVjaWFsIGNhc2UKKyAgICAgICAgYWxsb3dTaGFyaW5nID0g bV9ub2RlLT5sb2NhbE5hbWUoKSAhPSBIVE1MTmFtZXM6Om5vc2NyaXB0VGFnLmxvY2FsTmFtZSgp OworI2VuZGlmCisgICAgICAgIHJldHVybiBtX25vZGUtPmRvY3VtZW50KCktPnN0eWxlU2VsZWN0 b3IoKS0+c3R5bGVGb3JFbGVtZW50KHN0YXRpY19jYXN0PEVsZW1lbnQqPihtX25vZGUpLCAwLCBh bGxvd1NoYXJpbmcpOworICAgIH0KKyAgICBDb250YWluZXJOb2RlKiBwYXJlbnROb2RlRm9yU3R5 bGUgPSBwYXJlbnROb2RlRm9yUmVuZGVyaW5nQW5kU3R5bGUoKTsKKyAgICByZXR1cm4gcGFyZW50 Tm9kZUZvclN0eWxlICYmIHBhcmVudE5vZGVGb3JTdHlsZS0+cmVuZGVyZXIoKSA/IHBhcmVudE5v ZGVGb3JTdHlsZS0+cmVuZGVyZXIoKS0+c3R5bGUoKSA6IDA7Cit9CisKIENvbnRhaW5lck5vZGUq IE5vZGVSZW5kZXJlckZhY3Rvcnk6OmZpbmRWaXN1YWxQYXJlbnQoKQogewogICAgIENvbnRhaW5l ck5vZGUqIHBhcmVudCA9IG1fbm9kZS0+cGFyZW50T3JIb3N0Tm9kZSgpOwpAQCAtMTU1Niw3ICsx NTcxLDcgQEAgUmVuZGVyT2JqZWN0KiBOb2RlUmVuZGVyZXJGYWN0b3J5OjpjcmVhdGVSZW5kZXJl ckFuZFN0eWxlKCkKICAgICBpZiAoIXNob3VsZENyZWF0ZVJlbmRlcmVyKCkpCiAgICAgICAgIHJl dHVybiAwOwogCi0gICAgUmVmUHRyPFJlbmRlclN0eWxlPiBzdHlsZSA9IG1fbm9kZS0+c3R5bGVG b3JSZW5kZXJlcigpOworICAgIFJlZlB0cjxSZW5kZXJTdHlsZT4gc3R5bGUgPSBzdHlsZUZvclJl bmRlcmVyKCk7CiAgICAgaWYgKCFtX25vZGUtPnJlbmRlcmVySXNOZWVkZWQoc3R5bGUuZ2V0KCkp KQogICAgICAgICByZXR1cm4gMDsKIApAQCAtMTYyMSwxNSArMTYzNiw3IEBAIHZvaWQgTm9kZTo6 Y3JlYXRlUmVuZGVyZXJJZk5lZWRlZCgpCiAKIFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IE5vZGU6 OnN0eWxlRm9yUmVuZGVyZXIoKQogewotICAgIGlmIChpc0VsZW1lbnROb2RlKCkpIHsKLSAgICAg ICAgYm9vbCBhbGxvd1NoYXJpbmcgPSB0cnVlOwotI2lmIEVOQUJMRShYSFRNTE1QKQotICAgICAg ICAvLyBub3NjcmlwdCBuZWVkcyB0aGUgZGlzcGxheSBwcm9wZXJ0eSBwcm90ZWN0ZWQgLSBpdCdz IGEgc3BlY2lhbCBjYXNlCi0gICAgICAgIGFsbG93U2hhcmluZyA9IGxvY2FsTmFtZSgpICE9IEhU TUxOYW1lczo6bm9zY3JpcHRUYWcubG9jYWxOYW1lKCk7Ci0jZW5kaWYKLSAgICAgICAgcmV0dXJu IGRvY3VtZW50KCktPnN0eWxlU2VsZWN0b3IoKS0+c3R5bGVGb3JFbGVtZW50KHN0YXRpY19jYXN0 PEVsZW1lbnQqPih0aGlzKSwgMCwgYWxsb3dTaGFyaW5nKTsKLSAgICB9Ci0gICAgcmV0dXJuIHBh cmVudE5vZGUoKSAmJiBwYXJlbnROb2RlKCktPnJlbmRlcmVyKCkgPyBwYXJlbnROb2RlKCktPnJl bmRlcmVyKCktPnN0eWxlKCkgOiAwOworICAgIHJldHVybiBOb2RlUmVuZGVyZXJGYWN0b3J5KHRo aXMpLnN0eWxlRm9yUmVuZGVyZXIoKTsKIH0KIAogYm9vbCBOb2RlOjpyZW5kZXJlcklzTmVlZGVk KFJlbmRlclN0eWxlICpzdHlsZSkK