66120 2011-08-11 17:58:46 -0700 Incorrect data retrieved in calls to get selection data in client->textWillBeReplaced() from CharacterData::setDataAndUpdate 2012-08-16 07:06:23 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Mac OS X 10.7 RESOLVED FIXED InRadar P2 Normal --- 94192 54535 1 jonlee shinyak enrica inferno mitz rniwa shinyak webkit-bug-importer webkit.review.bot oldest_to_newest 450198 0 jonlee 2011-08-11 17:58:46 -0700 The call to textWillBeReplaced() in CharacterData::setDataAndUpdate() is performed before the text node gets updated, and before the document is notified that text has been removed. textWillBeReplaced() updates the selection, which in turn notifies the client. If the client decides to retrieve the selection, or create a Range based on the data or selection, the client would retrieve incorrect data for the following reasons: 1) Since the DOM node has not been updated yet, the desired selection/caret might be outside of the available DOM range. (For example, if the user types a character) 2) Any ranges created by the client into the document would get adjusted by the textRemoved() call. It would seem to make sense to move the textWillBeReplaced() call to after the textRemoved() call, but I would appreciate some input as to why this call is made when it is made. 450199 1 jonlee 2011-08-11 17:59:14 -0700 <rdar://problem/9922944> 450204 2 rniwa 2011-08-11 18:11:57 -0700 (In reply to comment #0) > It would seem to make sense to move the textWillBeReplaced() call to after the textRemoved() call, but I would appreciate some input as to why this call is made when it is made. If we do this, then you'd have to update the code in textWillBeReplaced so that it'll update selection accordingly. The current code relies on the fact, it's called before the node is updated. 642264 3 145955 shinyak 2012-06-06 00:55:50 -0700 Created attachment 145955 Patch 642268 4 145955 rniwa 2012-06-06 00:58:34 -0700 Comment on attachment 145955 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=145955&action=review Did you run all the layout tests with this change? I'd expect hundreds of tests to fail. > Source/WebCore/ChangeLog:12 > + No new tests, refactoring. This is definitely not true. This change WILL change the webkit's behavior. A better justification will be that we can't test this in layout tests. 642300 5 shinyak 2012-06-06 02:29:59 -0700 (In reply to comment #4) > (From update of attachment 145955 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=145955&action=review > > Did you run all the layout tests with this change? I'd expect hundreds of tests to fail. As far as I tried, only around 10 tests failed. I'm not sure it's regression or not though... I have to run tests in ToT again... > > > Source/WebCore/ChangeLog:12 > > + No new tests, refactoring. > > This is definitely not true. This change WILL change the webkit's behavior. > A better justification will be that we can't test this in layout tests. OK. 642301 6 shinyak 2012-06-06 02:30:59 -0700 > As far as I tried, only around 10 tests failed. I'm not sure it's regression or not though... > I have to run tests in ToT again... Actually I hoped EWS to test them... But chromium bot is down now. Too bad. 642688 7 145955 rniwa 2012-06-06 12:23:56 -0700 Comment on attachment 145955 Patch r=me as long as tests pass. Please update the change log as advised. 643254 8 146207 shinyak 2012-06-06 23:31:30 -0700 Created attachment 146207 Patch for landing 643416 9 146207 webkit.review.bot 2012-06-07 04:45:36 -0700 Comment on attachment 146207 Patch for landing Clearing flags on attachment: 146207 Committed r119705: <http://trac.webkit.org/changeset/119705> 643417 10 webkit.review.bot 2012-06-07 04:45:41 -0700 All reviewed patches have been landed. Closing bug. 696801 11 webkit.review.bot 2012-08-16 00:02:31 -0700 Re-opened since this is blocked by 94192 696810 12 inferno 2012-08-16 00:07:37 -0700 *** Bug 91325 has been marked as a duplicate of this bug. *** 696811 13 inferno 2012-08-16 00:08:43 -0700 (In reply to comment #12) > *** Bug 91325 has been marked as a duplicate of this bug. *** Please do see the testcase in 91325 which reproduces 100% reliably on asanified version of chromium linux and explanation of the problem in c#13. 696905 14 rniwa 2012-08-16 01:45:10 -0700 (In reply to comment #13) > (In reply to comment #12) > > *** Bug 91325 has been marked as a duplicate of this bug. *** > > Please do see the testcase in 91325 which reproduces 100% reliably on asanified version of chromium linux and explanation of the problem in c#13. This is crazy. Why was the patch rolled out without any prior notice or a formal review. 697091 15 inferno 2012-08-16 07:06:23 -0700 http://trac.webkit.org/changeset/125760 145955 2012-06-06 00:55:50 -0700 2012-06-06 23:31:25 -0700 Patch bug-66120-20120606165548.patch text/plain 4387 shinyak U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NTQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2RhZTUyMWFjOTI1ZGRj N2I2NjI2ZTE3NjVhZTAxN2JhN2VjNjhiOS4uYjk2OGNjY2M4MzNhN2QzNWQ0MWNiMGQyZjY5MGY2 M2EyZjUwZTNjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA2LTA2ICBTaGlu eWEgS2F3YW5ha2EgIDxzaGlueWFrQGNocm9taXVtLm9yZz4KKworICAgICAgICBJbmNvcnJlY3Qg ZGF0YSByZXRyaWV2ZWQgaW4gY2FsbHMgdG8gZ2V0IHNlbGVjdGlvbiBkYXRhIGluIGNsaWVudC0+ dGV4dFdpbGxCZVJlcGxhY2VkIGZyb20gQ2hhcmFjdGVyRGF0YTo6c2V0RGF0YUFuZFVwZGF0ZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYxMjAKKwor ICAgICAgICBTaW5jZSBGcmFtZVNlbGVjdGlvbjo6dGV4dFdpbGxCZVJlcGxhY2VkIHdhcyBjYWxs ZWQgYmVmb3JlIHJlcGxhY2luZyB0ZXh0LCB1cGRhdGVkIFNlbGVjdGlvbiBiZWNhbWUKKyAgICAg ICAgdGVtcG9yYXJpbHkgaW52YWxpZC4gVGhlIGludmFsaWQgc2VsZWN0aW9uIHdhcyBzZXQgdG8g dXBkYXRlU2VsZWN0aW9uKCksIHNvIGNsaWVudCB3aWxsIGhhdmUKKyAgICAgICAgaW52YWxpZCBz ZWxlY3Rpb24uCisKKyAgICAgICAgVGhpcyBwYXRjaCBtYWtlcyBjYWxsaW5nIHVwZGF0ZVNlbGVj dGlvbigpIGFmdGVyIHVwZGF0aW5nIHNlbGVjdGlvbi4KKworICAgICAgICBObyBuZXcgdGVzdHMs IHJlZmFjdG9yaW5nLgorCisgICAgICAgICogZG9tL0NoYXJhY3RlckRhdGEuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Q2hhcmFjdGVyRGF0YTo6c2V0RGF0YUFuZFVwZGF0ZSk6CisgICAgICAgICog ZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjp1cGRhdGVQb3Np dGlvbkFmdGVyQWRvcHRpbmdUZXh0UmVwbGFjZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6RnJh bWVTZWxlY3Rpb246OnRleHRXYXNSZXBsYWNlZCk6CisgICAgICAgICogZWRpdGluZy9GcmFtZVNl bGVjdGlvbi5oOgorICAgICAgICAoRnJhbWVTZWxlY3Rpb24pOgorCiAyMDEyLTA2LTA1ICBZb3No aWZ1bWkgSW5vdWUgIDx5b3NpbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Zvcm1zXSBJbnRy b2R1Y2UgSW5wdXROdW1iZXIgdHlwZSBhcyBhbiBhbGlhcyBvZiBkb3VibGUgZm9yIHJlcGxhY2lu ZyBpdCB0byBEZWNpbWFsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vQ2hhcmFjdGVy RGF0YS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vQ2hhcmFjdGVyRGF0YS5jcHAKaW5kZXggMjgz N2E3OGEzYzdlOTkzNTFlNTlkZDBiNDUxN2Y5ZTlkNGVhYzYwNC4uNzYxOThmYmU1ZDgwMTZmMTkw ZWM4Mzc1YjAwNTg5MTNjYjNkN2Q3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0No YXJhY3RlckRhdGEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9DaGFyYWN0ZXJEYXRhLmNw cApAQCAtMTc2LDExICsxNzYsMTQgQEAgdm9pZCBDaGFyYWN0ZXJEYXRhOjpzZXROb2RlVmFsdWUo Y29uc3QgU3RyaW5nJiBub2RlVmFsdWUsIEV4Y2VwdGlvbkNvZGUmIGVjKQogCiB2b2lkIENoYXJh Y3RlckRhdGE6OnNldERhdGFBbmRVcGRhdGUoY29uc3QgU3RyaW5nJiBuZXdEYXRhLCB1bnNpZ25l ZCBvZmZzZXRPZlJlcGxhY2VkRGF0YSwgdW5zaWduZWQgb2xkTGVuZ3RoLCB1bnNpZ25lZCBuZXdM ZW5ndGgpCiB7Ci0gICAgaWYgKGRvY3VtZW50KCktPmZyYW1lKCkpCi0gICAgICAgIGRvY3VtZW50 KCktPmZyYW1lKCktPnNlbGVjdGlvbigpLT50ZXh0V2lsbEJlUmVwbGFjZWQodGhpcywgb2Zmc2V0 T2ZSZXBsYWNlZERhdGEsIG9sZExlbmd0aCwgbmV3TGVuZ3RoKTsKICAgICBTdHJpbmcgb2xkRGF0 YSA9IG1fZGF0YTsKICAgICBtX2RhdGEgPSBuZXdEYXRhOworCiAgICAgdXBkYXRlUmVuZGVyZXIo b2Zmc2V0T2ZSZXBsYWNlZERhdGEsIG9sZExlbmd0aCk7CisKKyAgICBpZiAoZG9jdW1lbnQoKS0+ ZnJhbWUoKSkKKyAgICAgICAgZG9jdW1lbnQoKS0+ZnJhbWUoKS0+c2VsZWN0aW9uKCktPnRleHRX YXNSZXBsYWNlZCh0aGlzLCBvZmZzZXRPZlJlcGxhY2VkRGF0YSwgb2xkTGVuZ3RoLCBuZXdMZW5n dGgpOworCiAgICAgZG9jdW1lbnQoKS0+aW5jRE9NVHJlZVZlcnNpb24oKTsKICAgICBkaXNwYXRj aE1vZGlmaWVkRXZlbnQob2xkRGF0YSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9l ZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVT ZWxlY3Rpb24uY3BwCmluZGV4IDFhNzQ2OGVlN2ZlYzdhZGJiMmQ0YzEyMGNiZmY5MGM0YTcwOWI3 OTQuLjViOWNhMjg2ZGQ4NjQzYzgxZmJjMWRlZTNkOGRmMTFiZWZkMjNmODAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCkBAIC00MjIsNiArNDIyLDggQEAgc3Rh dGljIHZvaWQgdXBkYXRlUG9zaXRpb25BZnRlckFkb3B0aW5nVGV4dFJlcGxhY2VtZW50KFBvc2l0 aW9uJiBwb3NpdGlvbiwgQ2hhcmEKICAgICAvLyAocG9zaXRpb25PZmZzZXQgPiBvZmZzZXQgKyBv bGRMZW5ndGgpIHRvIGF2b2lkIGhhdmluZyBhIHN0YWxlIG9mZnNldC4KICAgICBpZiAocG9zaXRp b25PZmZzZXQgPiBvZmZzZXQgKyBvbGRMZW5ndGgpCiAgICAgICAgIHBvc2l0aW9uLm1vdmVUb09m ZnNldChwb3NpdGlvbk9mZnNldCAtIG9sZExlbmd0aCArIG5ld0xlbmd0aCk7CisKKyAgICBBU1NF UlQoc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHBvc2l0aW9uLm9mZnNldEluQ29udGFpbmVyTm9kZSgp KSA8PSBub2RlLT5sZW5ndGgoKSk7CiB9CiAKIHN0YXRpYyBpbmxpbmUgYm9vbCBub2RlSXNEZXRh Y2hlZEZyb21Eb2N1bWVudChOb2RlKiBub2RlKQpAQCAtNDMxLDcgKzQzMyw3IEBAIHN0YXRpYyBp bmxpbmUgYm9vbCBub2RlSXNEZXRhY2hlZEZyb21Eb2N1bWVudChOb2RlKiBub2RlKQogICAgIHJl dHVybiBoaWdoZXN0LT5ub2RlVHlwZSgpID09IE5vZGU6OkRPQ1VNRU5UX0ZSQUdNRU5UX05PREUg JiYgIWhpZ2hlc3QtPmlzU2hhZG93Um9vdCgpOwogfQogCi12b2lkIEZyYW1lU2VsZWN0aW9uOjp0 ZXh0V2lsbEJlUmVwbGFjZWQoQ2hhcmFjdGVyRGF0YSogbm9kZSwgdW5zaWduZWQgb2Zmc2V0LCB1 bnNpZ25lZCBvbGRMZW5ndGgsIHVuc2lnbmVkIG5ld0xlbmd0aCkKK3ZvaWQgRnJhbWVTZWxlY3Rp b246OnRleHRXYXNSZXBsYWNlZChDaGFyYWN0ZXJEYXRhKiBub2RlLCB1bnNpZ25lZCBvZmZzZXQs IHVuc2lnbmVkIG9sZExlbmd0aCwgdW5zaWduZWQgbmV3TGVuZ3RoKQogewogICAgIC8vIFRoZSBm cmFnbWVudCBjaGVjayBpcyBhIHBlcmZvcm1hbmNlIG9wdGltaXphdGlvbi4gU2VlIGh0dHA6Ly90 cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzMwMDYyLgogICAgIGlmIChpc05vbmUoKSB8fCAhbm9k ZSB8fCBub2RlSXNEZXRhY2hlZEZyb21Eb2N1bWVudChub2RlKSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uaCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRp bmcvRnJhbWVTZWxlY3Rpb24uaAppbmRleCBiNGQ5MmUzM2IyNDc3NWQ3YTMzYTZkY2ZkY2Y0NzVi OWY2N2I0YzQzLi44ZmM0MmVjY2UwMzYyMDJhN2YwMjg0MGEwZTVkMTM0ZGM2NWRmYjA4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5oCkBAIC0xOTcsNyArMTk3LDcgQEAg cHVibGljOgogICAgIHZvaWQgZGVidWdSZW5kZXJlcihSZW5kZXJPYmplY3QqLCBib29sIHNlbGVj dGVkKSBjb25zdDsKIAogICAgIHZvaWQgbm9kZVdpbGxCZVJlbW92ZWQoTm9kZSopOwotICAgIHZv aWQgdGV4dFdpbGxCZVJlcGxhY2VkKENoYXJhY3RlckRhdGEqLCB1bnNpZ25lZCBvZmZzZXQsIHVu c2lnbmVkIG9sZExlbmd0aCwgdW5zaWduZWQgbmV3TGVuZ3RoKTsKKyAgICB2b2lkIHRleHRXYXNS ZXBsYWNlZChDaGFyYWN0ZXJEYXRhKiwgdW5zaWduZWQgb2Zmc2V0LCB1bnNpZ25lZCBvbGRMZW5n dGgsIHVuc2lnbmVkIG5ld0xlbmd0aCk7CiAKICAgICB2b2lkIHNldENhcmV0VmlzaWJsZShib29s IGNhcmV0SXNWaXNpYmxlKSB7IHNldENhcmV0VmlzaWJpbGl0eShjYXJldElzVmlzaWJsZSA/IFZp c2libGUgOiBIaWRkZW4pOyB9CiAgICAgdm9pZCBjbGVhckNhcmV0UmVjdElmTmVlZGVkKCk7Cg== 146207 2012-06-06 23:31:30 -0700 2012-06-07 04:45:36 -0700 Patch for landing bug-66120-20120607153129.patch text/plain 4443 shinyak U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5Njg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDk3NDJkYmI2YWMzN2Rm NzJhNWU3YmI1YjI5Nzk3OGE1OWRiOTVhMC4uYjc0OThjOGM5MzZjMjBlYjgxMDk1MWVhN2I3MTg2 MDZkNTgwMWZkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA2LTA2ICBTaGlu eWEgS2F3YW5ha2EgIDxzaGlueWFrQGNocm9taXVtLm9yZz4KKworICAgICAgICBJbmNvcnJlY3Qg ZGF0YSByZXRyaWV2ZWQgaW4gY2FsbHMgdG8gZ2V0IHNlbGVjdGlvbiBkYXRhIGluIGNsaWVudC0+ dGV4dFdpbGxCZVJlcGxhY2VkIGZyb20gQ2hhcmFjdGVyRGF0YTo6c2V0RGF0YUFuZFVwZGF0ZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYxMjAKKwor ICAgICAgICBSZXZpZXdlZCBieSBSeW9zdWtlIE5pd2EuCisKKyAgICAgICAgU2luY2UgRnJhbWVT ZWxlY3Rpb246OnRleHRXaWxsQmVSZXBsYWNlZCB3YXMgY2FsbGVkIGJlZm9yZSByZXBsYWNpbmcg dGV4dCwgdXBkYXRlZCBTZWxlY3Rpb24gYmVjYW1lCisgICAgICAgIHRlbXBvcmFyaWx5IGludmFs aWQuIFRoZSBpbnZhbGlkIHNlbGVjdGlvbiB3YXMgc2V0IHRvIHVwZGF0ZVNlbGVjdGlvbigpLCBz byBjbGllbnQgd2lsbCBoYXZlCisgICAgICAgIGludmFsaWQgc2VsZWN0aW9uLgorCisgICAgICAg IFRoaXMgcGF0Y2ggbWFrZXMgY2FsbGluZyB1cGRhdGVTZWxlY3Rpb24oKSBhZnRlciB1cGRhdGlu ZyBzZWxlY3Rpb24uCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBpdCdzIHRvbyBoYXJkIHRvIGNy ZWF0ZSBhIGNvcnJlY3QgdGVzdCBjYXNlcyBpbiBEUlQuCisKKyAgICAgICAgKiBkb20vQ2hhcmFj dGVyRGF0YS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDaGFyYWN0ZXJEYXRhOjpzZXREYXRhQW5k VXBkYXRlKToKKyAgICAgICAgKiBlZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OnVwZGF0ZVBvc2l0aW9uQWZ0ZXJBZG9wdGluZ1RleHRSZXBsYWNlbWVudCk6Cisg ICAgICAgIChXZWJDb3JlOjpGcmFtZVNlbGVjdGlvbjo6dGV4dFdhc1JlcGxhY2VkKToKKyAgICAg ICAgKiBlZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmg6CisgICAgICAgIChGcmFtZVNlbGVjdGlvbik6 CisKIDIwMTItMDYtMDYgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgogCiAgICAgICAg IFdyYXAgdXBwZXJjYXNlV29yZCwgbG93ZXJjYXNlV29yZCwgYW5kIGNhcGl0YWxpemVXb3JkIHdp dGggVVNFKEFQUEtJVCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9DaGFyYWN0ZXJE YXRhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9DaGFyYWN0ZXJEYXRhLmNwcAppbmRleCAyODM3 YTc4YTNjN2U5OTM1MWU1OWRkMGI0NTE3ZjllOWQ0ZWFjNjA0Li43NjE5OGZiZTVkODAxNmYxOTBl YzgzNzViMDA1ODkxM2NiM2Q3ZDc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vQ2hh cmFjdGVyRGF0YS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0NoYXJhY3RlckRhdGEuY3Bw CkBAIC0xNzYsMTEgKzE3NiwxNCBAQCB2b2lkIENoYXJhY3RlckRhdGE6OnNldE5vZGVWYWx1ZShj b25zdCBTdHJpbmcmIG5vZGVWYWx1ZSwgRXhjZXB0aW9uQ29kZSYgZWMpCiAKIHZvaWQgQ2hhcmFj dGVyRGF0YTo6c2V0RGF0YUFuZFVwZGF0ZShjb25zdCBTdHJpbmcmIG5ld0RhdGEsIHVuc2lnbmVk IG9mZnNldE9mUmVwbGFjZWREYXRhLCB1bnNpZ25lZCBvbGRMZW5ndGgsIHVuc2lnbmVkIG5ld0xl bmd0aCkKIHsKLSAgICBpZiAoZG9jdW1lbnQoKS0+ZnJhbWUoKSkKLSAgICAgICAgZG9jdW1lbnQo KS0+ZnJhbWUoKS0+c2VsZWN0aW9uKCktPnRleHRXaWxsQmVSZXBsYWNlZCh0aGlzLCBvZmZzZXRP ZlJlcGxhY2VkRGF0YSwgb2xkTGVuZ3RoLCBuZXdMZW5ndGgpOwogICAgIFN0cmluZyBvbGREYXRh ID0gbV9kYXRhOwogICAgIG1fZGF0YSA9IG5ld0RhdGE7CisKICAgICB1cGRhdGVSZW5kZXJlcihv ZmZzZXRPZlJlcGxhY2VkRGF0YSwgb2xkTGVuZ3RoKTsKKworICAgIGlmIChkb2N1bWVudCgpLT5m cmFtZSgpKQorICAgICAgICBkb2N1bWVudCgpLT5mcmFtZSgpLT5zZWxlY3Rpb24oKS0+dGV4dFdh c1JlcGxhY2VkKHRoaXMsIG9mZnNldE9mUmVwbGFjZWREYXRhLCBvbGRMZW5ndGgsIG5ld0xlbmd0 aCk7CisKICAgICBkb2N1bWVudCgpLT5pbmNET01UcmVlVmVyc2lvbigpOwogICAgIGRpc3BhdGNo TW9kaWZpZWRFdmVudChvbGREYXRhKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNl bGVjdGlvbi5jcHAKaW5kZXggMWE3NDY4ZWU3ZmVjN2FkYmIyZDRjMTIwY2JmZjkwYzRhNzA5Yjc5 NC4uNWI5Y2EyODZkZDg2NDNjODFmYmMxZGVlM2Q4ZGYxMWJlZmQyM2Y4MCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHAKQEAgLTQyMiw2ICs0MjIsOCBAQCBzdGF0 aWMgdm9pZCB1cGRhdGVQb3NpdGlvbkFmdGVyQWRvcHRpbmdUZXh0UmVwbGFjZW1lbnQoUG9zaXRp b24mIHBvc2l0aW9uLCBDaGFyYQogICAgIC8vIChwb3NpdGlvbk9mZnNldCA+IG9mZnNldCArIG9s ZExlbmd0aCkgdG8gYXZvaWQgaGF2aW5nIGEgc3RhbGUgb2Zmc2V0LgogICAgIGlmIChwb3NpdGlv bk9mZnNldCA+IG9mZnNldCArIG9sZExlbmd0aCkKICAgICAgICAgcG9zaXRpb24ubW92ZVRvT2Zm c2V0KHBvc2l0aW9uT2Zmc2V0IC0gb2xkTGVuZ3RoICsgbmV3TGVuZ3RoKTsKKworICAgIEFTU0VS VChzdGF0aWNfY2FzdDx1bnNpZ25lZD4ocG9zaXRpb24ub2Zmc2V0SW5Db250YWluZXJOb2RlKCkp IDw9IG5vZGUtPmxlbmd0aCgpKTsKIH0KIAogc3RhdGljIGlubGluZSBib29sIG5vZGVJc0RldGFj aGVkRnJvbURvY3VtZW50KE5vZGUqIG5vZGUpCkBAIC00MzEsNyArNDMzLDcgQEAgc3RhdGljIGlu bGluZSBib29sIG5vZGVJc0RldGFjaGVkRnJvbURvY3VtZW50KE5vZGUqIG5vZGUpCiAgICAgcmV0 dXJuIGhpZ2hlc3QtPm5vZGVUeXBlKCkgPT0gTm9kZTo6RE9DVU1FTlRfRlJBR01FTlRfTk9ERSAm JiAhaGlnaGVzdC0+aXNTaGFkb3dSb290KCk7CiB9CiAKLXZvaWQgRnJhbWVTZWxlY3Rpb246OnRl eHRXaWxsQmVSZXBsYWNlZChDaGFyYWN0ZXJEYXRhKiBub2RlLCB1bnNpZ25lZCBvZmZzZXQsIHVu c2lnbmVkIG9sZExlbmd0aCwgdW5zaWduZWQgbmV3TGVuZ3RoKQordm9pZCBGcmFtZVNlbGVjdGlv bjo6dGV4dFdhc1JlcGxhY2VkKENoYXJhY3RlckRhdGEqIG5vZGUsIHVuc2lnbmVkIG9mZnNldCwg dW5zaWduZWQgb2xkTGVuZ3RoLCB1bnNpZ25lZCBuZXdMZW5ndGgpCiB7CiAgICAgLy8gVGhlIGZy YWdtZW50IGNoZWNrIGlzIGEgcGVyZm9ybWFuY2Ugb3B0aW1pemF0aW9uLiBTZWUgaHR0cDovL3Ry YWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMzAwNjIuCiAgICAgaWYgKGlzTm9uZSgpIHx8ICFub2Rl IHx8IG5vZGVJc0RldGFjaGVkRnJvbURvY3VtZW50KG5vZGUpKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvZWRpdGlu Zy9GcmFtZVNlbGVjdGlvbi5oCmluZGV4IGI0ZDkyZTMzYjI0Nzc1ZDdhMzNhNmRjZmRjZjQ3NWI5 ZjY3YjRjNDMuLjhmYzQyZWNjZTAzNjIwMmE3ZjAyODQwYTBlNWQxMzRkYzY1ZGZiMDggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmgKQEAgLTE5Nyw3ICsxOTcsNyBAQCBw dWJsaWM6CiAgICAgdm9pZCBkZWJ1Z1JlbmRlcmVyKFJlbmRlck9iamVjdCosIGJvb2wgc2VsZWN0 ZWQpIGNvbnN0OwogCiAgICAgdm9pZCBub2RlV2lsbEJlUmVtb3ZlZChOb2RlKik7Ci0gICAgdm9p ZCB0ZXh0V2lsbEJlUmVwbGFjZWQoQ2hhcmFjdGVyRGF0YSosIHVuc2lnbmVkIG9mZnNldCwgdW5z aWduZWQgb2xkTGVuZ3RoLCB1bnNpZ25lZCBuZXdMZW5ndGgpOworICAgIHZvaWQgdGV4dFdhc1Jl cGxhY2VkKENoYXJhY3RlckRhdGEqLCB1bnNpZ25lZCBvZmZzZXQsIHVuc2lnbmVkIG9sZExlbmd0 aCwgdW5zaWduZWQgbmV3TGVuZ3RoKTsKIAogICAgIHZvaWQgc2V0Q2FyZXRWaXNpYmxlKGJvb2wg Y2FyZXRJc1Zpc2libGUpIHsgc2V0Q2FyZXRWaXNpYmlsaXR5KGNhcmV0SXNWaXNpYmxlID8gVmlz aWJsZSA6IEhpZGRlbik7IH0KICAgICB2b2lkIGNsZWFyQ2FyZXRSZWN0SWZOZWVkZWQoKTsK