41485 2010-07-01 14:29:18 -0700 Crash in replaceSelectionCommand with RTL text 2010-08-11 03:31:19 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jparent jparent ap commit-queue darin enrica justin.garcia kocienda mitz mjs tony webkit.review.bot oldest_to_newest 245551 0 60288 jparent 2010-07-01 14:29:18 -0700 Created attachment 60288 Test case for crash Repro steps: 1. Text that is followed by a space, in RTL text, in white-space:pre contentEditable/text input/textarea (Example: <div id='foo' style='white-space:pre' contentEditable >text </div>) 1. Select the word (example: "text", not the space after it) 2. Do anything that calls replaceSelection. Result: Crash. Crash seems to happens because in DeleteSelectionCommand, deleteInsignificantTextDownstream deletes the whitespace, but then fixupWhitespace still expects the space to be there, and crashes because there is no longer a text node (the text has been deleted, and the whitespace, so there is no longer a text node). The core bug seems to be in CompositeEditCommand::deleteInsignificantText, where it determines that it should remove the space. I *think* the issue is that it needs to iterate through the text boxes in reverse order for RTL case, but I'm not positive. Testing that out now. 245607 1 60303 jparent 2010-07-01 15:38:57 -0700 Created attachment 60303 Patch - reverses the order we iterate over the text boxes in when there is rtl text. 245609 2 webkit.review.bot 2010-07-01 15:42:04 -0700 Attachment 60303 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 LayoutTests/ChangeLog:6: Line contains tab character. [whitespace/tab] [5] LayoutTests/ChangeLog:7: Line contains tab character. [whitespace/tab] [5] LayoutTests/ChangeLog:8: Line contains tab character. [whitespace/tab] [5] LayoutTests/ChangeLog:9: Line contains tab character. [whitespace/tab] [5] WebCore/ChangeLog:6: Line contains tab character. [whitespace/tab] [5] WebCore/ChangeLog:8: Line contains tab character. [whitespace/tab] [5] WebCore/ChangeLog:9: Line contains tab character. [whitespace/tab] [5] Total errors found: 7 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 245738 3 tony 2010-07-01 20:55:25 -0700 > +document.getSelection().setBaseAndExtent(foo.firstChild, 0, foo.firstChild, 4); > +document.execCommand('InsertImage', false, "../resources/abe.png"); > +</script> > \ No newline at end of file > > Property changes on: LayoutTests/editing/execCommand/insert-image-on-top-of-rtl.html > ___________________________________________________________________ > Added: svn:executable > + * > Drive by nit: no newline at end of file (just to get rid of the annoying warning from svn) and remove the svn:executable prop? 246041 4 mitz 2010-07-02 12:46:54 -0700 Why is this correct? Is it correcrt to always iterate from last to first? If not, why not? 246103 5 60303 jparent 2010-07-02 14:40:33 -0700 Comment on attachment 60303 Patch - reverses the order we iterate over the text boxes in when there is rtl text. Removing r?, as I've found some issues with this. 246160 6 jparent 2010-07-02 16:52:39 -0700 (Added original author and reviewer of the code in question) Additional details on what is going on here, and why my initial patch is wrong: The crash only happens inside a dir=rtl area, when the text is english, with a space. Specifically, given the following 4 cases: 1. RTL region, english text: <div dir='rtl' style='white-space:pre' contentEditable >the </div> 2. LTR region, english text: <div dir='ltr' style='white-space:pre' contentEditable >the </div> 3. RTL region, arabic text: <div dir='rtl' style='white-space:pre' contentEditable >אחת </div> 4. LTR region, arabic text: <div dir='rtl' style='white-space:pre' contentEditable >אחת </div> Currently, the crash only happens with case #1. With my patch, #1 doesn't crash, but #4 does. For these cases, we have the following InlineTextBoxes. Case 1: Box: start 3, len 1. Next box: start 0, len 3 (box for the space with direction = RTL, box for "the" with direction = LTR) Case 2: Box: start 0, len 4 (box for the whole thing "the ", direction LTR) Case 3: Box: start 0, len 4 (box for the whole thing "אחת ", direction RTL) Case 4: Box: start 0, len 3. Next box: start 3, len 1 (box for "אחת" with direction RTL, box for space direction LTR) So in the case of single directionality, there is a single box spanning the entire thing. In the cases of mixed directionality, there is a box for the word and a box for the space. Inside CompositeEditCommand::deleteInsignificantText, it tries to compute "gaps" using these boxes. In case #1, it computes 0-3 aka, "the" as a gap, although it is text. I think that is what goes wrong, but I don't really understand the code well enough. My patch changed it to start with the last box rather than the first in the case of RTL, but that just swapped cases 1 and 4, so clearly isn't correct. Anyone familiar with that code have any thoughts? This is 6 years old, from http://trac.webkit.org/changeset/7875, and doesn't seem like it has been touched much. 249376 7 61120 jparent 2010-07-09 17:32:27 -0700 Created attachment 61120 Patch - New approach, sort the text boxes before using them. 250736 8 jparent 2010-07-13 14:09:57 -0700 Any chance someone can review this? This is a pretty frequent crasher, since this code path can be hit in a number of ways - paste, execCommands that replace the selection, Chromium's spell check when you replace the word (Safari didn't seem to crash with spell check), etc. 250762 9 darin 2010-07-13 14:56:03 -0700 Enrica is on vacation. She returns Monday. 258990 10 jparent 2010-08-02 11:12:53 -0700 Enrica, can you take a look at this? (Welcome back from vacation!) 259094 11 61120 eric 2010-08-02 14:00:52 -0700 Comment on attachment 61120 Patch - New approach, sort the text boxes before using them. Talking about this with jparent in person this afternoon. It seems strange to me that Editing would really need to walk the linebox tree like this. And that walking the linebox in the manner would end up in an editing-only file. The linebox-based approach may be wrong? Would be nice to hear what Mitz has to say. 259097 12 61120 justin.garcia 2010-08-02 14:02:28 -0700 Comment on attachment 61120 Patch - New approach, sort the text boxes before using them. r=me 259100 13 justin.garcia 2010-08-02 14:04:20 -0700 (In reply to comment #11) > It seems strange to me that Editing would really need to walk the linebox tree like this. And that walking the linebox in the manner would end up in an editing-only file. I don't know, we do this all over editing. The code that the patch cleans up in TextIterator, for example. 259105 14 enrica 2010-08-02 14:06:34 -0700 (In reply to comment #13) > (In reply to comment #11) > > It seems strange to me that Editing would really need to walk the linebox tree like this. And that walking the linebox in the manner would end up in an editing-only file. > > I don't know, we do this all over editing. The code that the patch cleans up in TextIterator, for example. I agree with Justin. Julie's approach does not introduce the use of line boxes, it just makes it right. It looks ok to me. 263043 15 61120 abarth 2010-08-10 22:55:40 -0700 Comment on attachment 61120 Patch - New approach, sort the text boxes before using them. Shall we land this patch then? 263150 16 61120 commit-queue 2010-08-11 03:31:12 -0700 Comment on attachment 61120 Patch - New approach, sort the text boxes before using them. Clearing flags on attachment: 61120 Committed r65144: <http://trac.webkit.org/changeset/65144> 263151 17 commit-queue 2010-08-11 03:31:19 -0700 All reviewed patches have been landed. Closing bug. 60288 2010-07-01 14:29:18 -0700 2010-07-01 14:29:18 -0700 Test case for crash crashRepro.html text/html 262 jparent PGh0bWw+PGJvZHkgZGlyPSJydGwiPg0KPGRpdiBpZD0nZm9vJyBzdHlsZT0nd2hpdGUtc3BhY2U6 cHJlJyBjb250ZW50RWRpdGFibGUgPnRleHQgPC9kaXY+DQoNCjxzY3JpcHQ+DQpkb2N1bWVudC5n ZXRTZWxlY3Rpb24oKS5zZXRCYXNlQW5kRXh0ZW50KGZvby5maXJzdENoaWxkLCAwLCBmb28uZmly c3RDaGlsZCwgNCk7DQpkb2N1bWVudC5leGVjQ29tbWFuZCgnaW5zZXJ0SW1hZ2UnLCBmYWxzZSwg ZmFsc2UpOw0KPC9zY3JpcHQ+DQo8L2JvZHk+PC9odG1sPg== 60303 2010-07-01 15:38:57 -0700 2010-07-09 17:32:27 -0700 Patch - reverses the order we iterate over the text boxes in when there is rtl text. crasher.txt text/plain 3879 jparent SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MjMwNCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDctMDEgIEp1bGllIFBhcmVudCAgPGpwYXJlbnRAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IENyYXNoIGluIHJlcGxhY2VTZWxlY3Rpb25Db21tYW5kIHdpdGggUlRMIHRleHQuCisJaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxNDg1CisKKwlJZiB0aGUgc2VsZWN0 aW9uIGNvbnRhaW5zIHJ0bCB0ZXh0LCB3ZSBuZWVkIHRvIGl0ZXJhdGUgaW4KKwl0aGUgb3RoZXIg ZGlyZWN0aW9uLgorICAgICAgICBUZXN0OiBlZGl0aW5nL2V4ZWNDb21tYW5kL2luc2VydC1pbWFn ZS1vbi10b3Atb2YtcnRsLmh0bWwKKworICAgICAgICAqIGVkaXRpbmcvQ29tcG9zaXRlRWRpdENv bW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29tcG9zaXRlRWRpdENvbW1hbmQ6OmRlbGV0 ZUluc2lnbmlmaWNhbnRUZXh0KToKKwogMjAxMC0wNy0wMSAgQWxleGV5IFByb3NrdXJ5YWtvdiAg PGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpJbmRl eDogV2ViQ29yZS9lZGl0aW5nL0NvbXBvc2l0ZUVkaXRDb21tYW5kLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL2VkaXRpbmcvQ29tcG9zaXRlRWRpdENvbW1hbmQuY3BwCShyZXZpc2lvbiA2MjI5 OCkKKysrIFdlYkNvcmUvZWRpdGluZy9Db21wb3NpdGVFZGl0Q29tbWFuZC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTQ4OSw3ICs0ODksNyBAQCB2b2lkIENvbXBvc2l0ZUVkaXRDb21tYW5kOjpkZWxl dGVJbnNpZ25pCiAgICAgaWYgKCF0ZXh0UmVuZGVyZXIpCiAgICAgICAgIHJldHVybjsKIAotICAg IElubGluZVRleHRCb3gqIGJveCA9IHRleHRSZW5kZXJlci0+Zmlyc3RUZXh0Qm94KCk7CisgICAg SW5saW5lVGV4dEJveCogYm94ID0gdGV4dFJlbmRlcmVyLT5jb250YWluc1JldmVyc2VkVGV4dCgp ID8gdGV4dFJlbmRlcmVyLT5sYXN0VGV4dEJveCgpIDogdGV4dFJlbmRlcmVyLT5maXJzdFRleHRC b3goKTsKICAgICBpZiAoIWJveCkgewogICAgICAgICAvLyB3aG9sZSB0ZXh0IG5vZGUgaXMgZW1w dHkKICAgICAgICAgcmVtb3ZlTm9kZSh0ZXh0Tm9kZSk7CkBAIC01MjcsNyArNTI3LDcgQEAgdm9p ZCBDb21wb3NpdGVFZGl0Q29tbWFuZDo6ZGVsZXRlSW5zaWduaQogICAgICAgICAKICAgICAgICAg cHJldkJveCA9IGJveDsKICAgICAgICAgaWYgKGJveCkKLSAgICAgICAgICAgIGJveCA9IGJveC0+ bmV4dFRleHRCb3goKTsKKyAgICAgICAgICAgIGJveCA9IHRleHRSZW5kZXJlci0+Y29udGFpbnNS ZXZlcnNlZFRleHQoKSA/IGJveC0+cHJldlRleHRCb3goKSA6IGJveC0+bmV4dFRleHRCb3goKTsK ICAgICB9CiAKICAgICBpZiAoIXN0ci5pc051bGwoKSkgewpJbmRleDogTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNjIz MDQpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwx NiBAQAorMjAxMC0wNy0wMSAgSnVsaWUgUGFyZW50ICA8anBhcmVudEBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ3Jhc2ggaW4g cmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQgd2l0aCBSVEwgdGV4dC4KKwlodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDE0ODUKKwkKKwlBZGRzIGEgdGVzdCBjYXNlIHRoYXQg Y3Jhc2hlcyB3aXRob3V0IHRoZSBmaXggKHJlcGxhY2UgYSBzZWxlY3Rpb24KKwl0aGF0IGhhcyBy dGwgdGV4dCBhbmQgYSBzcGFjZSB3aXRoIGFuIGltYWdlKS4KKworICAgICAgICAqIGVkaXRpbmcv ZXhlY0NvbW1hbmQvaW5zZXJ0LWltYWdlLW9uLXRvcC1vZi1ydGwtZXhwZWN0ZWQudHh0OiBBZGRl ZC4KKyAgICAgICAgKiBlZGl0aW5nL2V4ZWNDb21tYW5kL2luc2VydC1pbWFnZS1vbi10b3Atb2Yt cnRsLmh0bWw6IEFkZGVkLgorCiAyMDEwLTA3LTAxICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBA YXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4uCkluZGV4OiBM YXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL2luc2VydC1pbWFnZS1vbi10b3Atb2YtcnRs LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21t YW5kL2luc2VydC1pbWFnZS1vbi10b3Atb2YtcnRsLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkK KysrIExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvaW5zZXJ0LWltYWdlLW9uLXRvcC1v Zi1ydGwtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDIgQEAKK1RoaXMgdGVz dCB1c2VzIGV4ZWNDb21tYW5kKCdpbnNlcnRJbWFnZScpIHRvIHJlcGxhY2UgdGhlIHNlbGVjdGlv bi4gSWYgdGhpcyBkb2Vzbid0IGNyYXNoLCB0aGVuIHRoZSB0ZXN0IHBhc3Nlcy4KKyAKSW5kZXg6 IExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvaW5zZXJ0LWltYWdlLW9uLXRvcC1vZi1y dGwuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL2lu c2VydC1pbWFnZS1vbi10b3Atb2YtcnRsLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0 cy9lZGl0aW5nL2V4ZWNDb21tYW5kL2luc2VydC1pbWFnZS1vbi10b3Atb2YtcnRsLmh0bWwJKHJl dmlzaW9uIDApCkBAIC0wLDAgKzEsMTAgQEAKKzxkaXY+VGhpcyB0ZXN0IHVzZXMgZXhlY0NvbW1h bmQoJ2luc2VydEltYWdlJykgdG8gcmVwbGFjZSB0aGUgc2VsZWN0aW9uLiAgSWYgdGhpcyBkb2Vz bid0IGNyYXNoLCB0aGVuIHRoZSB0ZXN0IHBhc3Nlcy48L2Rpdj4NCis8ZGl2IGRpcj0ncnRsJyBp ZD0nZm9vJyBzdHlsZT0nd2hpdGUtc3BhY2U6cHJlJyBjb250ZW50RWRpdGFibGUgPnRleHQgPC9k aXY+DQorPHNjcmlwdD4NCitpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQ0KKyAgICAg bGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOw0KKyAgICAgDQorLy8gU2VsZWN0IG9u bHkgInRleHQiLCBub3QgdGhlIHNwYWNlLg0KK2RvY3VtZW50LmdldFNlbGVjdGlvbigpLnNldEJh c2VBbmRFeHRlbnQoZm9vLmZpcnN0Q2hpbGQsIDAsIGZvby5maXJzdENoaWxkLCA0KTsNCitkb2N1 bWVudC5leGVjQ29tbWFuZCgnSW5zZXJ0SW1hZ2UnLCBmYWxzZSwgIi4uL3Jlc291cmNlcy9hYmUu cG5nIik7DQorPC9zY3JpcHQ+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQoKUHJvcGVydHkg Y2hhbmdlcyBvbjogTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9pbnNlcnQtaW1hZ2Ut b24tdG9wLW9mLXJ0bC5odG1sCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KQWRkZWQ6IHN2bjpleGVjdXRhYmxlCiAgICsg KgoK 61120 2010-07-09 17:32:27 -0700 2010-08-11 03:31:12 -0700 Patch - New approach, sort the text boxes before using them. crasher3.txt text/plain 7720 jparent SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MzAxNSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTAtMDctMDkgIEp1bGllIFBhcmVudCAgPGpwYXJlbnRAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IENyYXNoIGluIHJlcGxhY2VTZWxlY3Rpb25Db21tYW5kIHdpdGggUlRMIHRleHQuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTQ4NQorICAgICAgICAK KyAgICAgICAgRm9yIHRleHQgd2l0aCBtaXhlZCBkaXJlY3Rpb25hbGl0eSwgc29ydCB0aGUgdGV4 dCBib3hlcyBiZWZvcmUKKyAgICAgICAgY29tcHV0aW5nIGdhcHMsIHNpbmNlIHRoYXQgY29kZSBh c3N1bWVzIHRoZSBib3hlcyBhcmUgaW4gb3JkZXIuCisKKyAgICAgICAgVGVzdDogZWRpdGluZy9l eGVjQ29tbWFuZC9pbnNlcnQtaW1hZ2Utb24tdG9wLW9mLWRpcmVjdGlvbmFsLXRleHQuaHRtbAor CisgICAgICAgICogZWRpdGluZy9Db21wb3NpdGVFZGl0Q29tbWFuZC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpDb21wb3NpdGVFZGl0Q29tbWFuZDo6ZGVsZXRlSW5zaWduaWZpY2FudFRleHQpOiBT b3J0IGJveGVzCisgICAgICAgIGxpa2Ugd2UgZG8gaW4gVGV4dEl0ZXJhdG9yIGJlZm9yZSBjb21w dXRpbmcgZ2Fwcy4KKyAgICAgICAgKiBlZGl0aW5nL1RleHRJdGVyYXRvci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpUZXh0SXRlcmF0b3I6OmhhbmRsZVRleHROb2RlKTogVXNlIG5ldyBjb21wYXJl QnlTdGFydAorICAgICAgICByYXRoZXIgdGhhbiBjb21wYXJlQm94U3RhcnQuICBObyBmdW5jdGlv bmFsIGNoYW5nZS4KKyAgICAgICAgKiByZW5kZXJpbmcvSW5saW5lVGV4dEJveC5oOgorICAgICAg ICAoV2ViQ29yZTo6SW5saW5lVGV4dEJveDo6Y29tcGFyZUJ5U3RhcnQpOiBNb3ZlZCBjb21wYXJl Qm94U3RhcnQKKyAgICAgICAgZnJvbSBUZXh0SXRlcmF0b3IgaGVyZSBzbyBpdCBjYW4gYmUgdXNl ZCBpbiBtdWx0aXBsZSBwbGFjZXMuCisKIDIwMTAtMDctMDkgIER1bWl0cnUgRGFuaWxpdWMgIDxk dW1pQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCBidXQgcHJlLWFwcHJvdmVk IGJ5IEVyaWMgU2VpZGVsLgpJbmRleDogV2ViQ29yZS9lZGl0aW5nL0NvbXBvc2l0ZUVkaXRDb21t YW5kLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2VkaXRpbmcvQ29tcG9zaXRlRWRpdENvbW1h bmQuY3BwCShyZXZpc2lvbiA2Mjk2NCkKKysrIFdlYkNvcmUvZWRpdGluZy9Db21wb3NpdGVFZGl0 Q29tbWFuZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ4OSw3ICs0ODksMTggQEAgdm9pZCBDb21w b3NpdGVFZGl0Q29tbWFuZDo6ZGVsZXRlSW5zaWduaQogICAgIGlmICghdGV4dFJlbmRlcmVyKQog ICAgICAgICByZXR1cm47CiAKLSAgICBJbmxpbmVUZXh0Qm94KiBib3ggPSB0ZXh0UmVuZGVyZXIt PmZpcnN0VGV4dEJveCgpOworICAgIFZlY3RvcjxJbmxpbmVUZXh0Qm94Kj4gc29ydGVkVGV4dEJv eGVzOworICAgIHNpemVfdCBzb3J0ZWRUZXh0Qm94ZXNQb3NpdGlvbiA9IDA7CisgICAKKyAgICBm b3IgKElubGluZVRleHRCb3gqIHRleHRCb3ggPSB0ZXh0UmVuZGVyZXItPmZpcnN0VGV4dEJveCgp OyB0ZXh0Qm94OyB0ZXh0Qm94ID0gdGV4dEJveC0+bmV4dFRleHRCb3goKSkKKyAgICAgICAgc29y dGVkVGV4dEJveGVzLmFwcGVuZCh0ZXh0Qm94KTsKKyAgICAKKyAgICAvLyBJZiB0aGVyZSBpcyBt aXhlZCBkaXJlY3Rpb25hbGl0eSB0ZXh0LCB0aGUgYm94ZXMgY2FuIGJlIG91dCBvZiBvcmRlciwK KyAgICAvLyAobGlrZSBBcmFiaWMgd2l0aCBlbWJlZGRlZCBMVFIpLCBzbyBzb3J0IHRoZW0gZmly c3QuIAorICAgIGlmICh0ZXh0UmVuZGVyZXItPmNvbnRhaW5zUmV2ZXJzZWRUZXh0KCkpICAgIAor ICAgICAgICBzdGQ6OnNvcnQoc29ydGVkVGV4dEJveGVzLmJlZ2luKCksIHNvcnRlZFRleHRCb3hl cy5lbmQoKSwgSW5saW5lVGV4dEJveDo6Y29tcGFyZUJ5U3RhcnQpOworICAgIElubGluZVRleHRC b3gqIGJveCA9IHNvcnRlZFRleHRCb3hlcy5pc0VtcHR5KCkgPyAwIDogc29ydGVkVGV4dEJveGVz W3NvcnRlZFRleHRCb3hlc1Bvc2l0aW9uXTsKKwogICAgIGlmICghYm94KSB7CiAgICAgICAgIC8v IHdob2xlIHRleHQgbm9kZSBpcyBlbXB0eQogICAgICAgICByZW1vdmVOb2RlKHRleHROb2RlKTsK QEAgLTUyNiw4ICs1MzcsMTIgQEAgdm9pZCBDb21wb3NpdGVFZGl0Q29tbWFuZDo6ZGVsZXRlSW5z aWduaQogICAgICAgICB9CiAgICAgICAgIAogICAgICAgICBwcmV2Qm94ID0gYm94OwotICAgICAg ICBpZiAoYm94KQotICAgICAgICAgICAgYm94ID0gYm94LT5uZXh0VGV4dEJveCgpOworICAgICAg ICBpZiAoYm94KSB7CisgICAgICAgICAgICBpZiAoKytzb3J0ZWRUZXh0Qm94ZXNQb3NpdGlvbiA8 IHNvcnRlZFRleHRCb3hlcy5zaXplKCkpCisgICAgICAgICAgICAgICAgYm94ID0gc29ydGVkVGV4 dEJveGVzW3NvcnRlZFRleHRCb3hlc1Bvc2l0aW9uXTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAg ICAgICAgICAgICBib3ggPSAwOworICAgICAgICB9CiAgICAgfQogCiAgICAgaWYgKCFzdHIuaXNO dWxsKCkpIHsKSW5kZXg6IFdlYkNvcmUvZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwCShyZXZpc2lvbiA2Mjk2NCkK KysrIFdlYkNvcmUvZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00 MjQsMTEgKzQyNCw2IEBAIHZvaWQgVGV4dEl0ZXJhdG9yOjphZHZhbmNlKCkKICAgICB9CiB9CiAK LXN0YXRpYyBpbmxpbmUgYm9vbCBjb21wYXJlQm94U3RhcnQoY29uc3QgSW5saW5lVGV4dEJveCog Zmlyc3QsIGNvbnN0IElubGluZVRleHRCb3gqIHNlY29uZCkKLXsKLSAgICByZXR1cm4gZmlyc3Qt PnN0YXJ0KCkgPCBzZWNvbmQtPnN0YXJ0KCk7Ci19Ci0KIGJvb2wgVGV4dEl0ZXJhdG9yOjpoYW5k bGVUZXh0Tm9kZSgpCiB7CiAgICAgaWYgKG1fZnVsbHlDbGlwcGVkU3RhY2sudG9wKCkpCkBAIC00 NzAsNyArNDY1LDcgQEAgYm9vbCBUZXh0SXRlcmF0b3I6OmhhbmRsZVRleHROb2RlKCkKICAgICAg ICAgZm9yIChJbmxpbmVUZXh0Qm94KiB0ZXh0Qm94ID0gcmVuZGVyZXItPmZpcnN0VGV4dEJveCgp OyB0ZXh0Qm94OyB0ZXh0Qm94ID0gdGV4dEJveC0+bmV4dFRleHRCb3goKSkgewogICAgICAgICAg ICAgbV9zb3J0ZWRUZXh0Qm94ZXMuYXBwZW5kKHRleHRCb3gpOwogICAgICAgICB9Ci0gICAgICAg IHN0ZDo6c29ydChtX3NvcnRlZFRleHRCb3hlcy5iZWdpbigpLCBtX3NvcnRlZFRleHRCb3hlcy5l bmQoKSwgY29tcGFyZUJveFN0YXJ0KTsgCisgICAgICAgIHN0ZDo6c29ydChtX3NvcnRlZFRleHRC b3hlcy5iZWdpbigpLCBtX3NvcnRlZFRleHRCb3hlcy5lbmQoKSwgSW5saW5lVGV4dEJveDo6Y29t cGFyZUJ5U3RhcnQpOyAKICAgICAgICAgbV9zb3J0ZWRUZXh0Qm94ZXNQb3NpdGlvbiA9IDA7CiAg ICAgfQogICAgIApJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3guaAkocmV2aXNpb24gNjI5 NjQpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmgJKHdvcmtpbmcgY29weSkK QEAgLTY3LDYgKzY3LDcgQEAgcHVibGljOgogCiAgICAgYm9vbCBoYXNIeXBoZW4oKSBjb25zdCB7 IHJldHVybiBtX2hhc0VsbGlwc2lzQm94T3JIeXBoZW47IH0KICAgICB2b2lkIHNldEhhc0h5cGhl bihib29sIGhhc0h5cGhlbikgeyBtX2hhc0VsbGlwc2lzQm94T3JIeXBoZW4gPSBoYXNIeXBoZW47 IH0KKyAgICBzdGF0aWMgaW5saW5lIGJvb2wgY29tcGFyZUJ5U3RhcnQoY29uc3QgSW5saW5lVGV4 dEJveCogZmlyc3QsIGNvbnN0IElubGluZVRleHRCb3gqIHNlY29uZCkgeyByZXR1cm4gZmlyc3Qt PnN0YXJ0KCkgPCBzZWNvbmQtPnN0YXJ0KCk7IH0KIAogcHJpdmF0ZToKICAgICB2aXJ0dWFsIGlu dCBzZWxlY3Rpb25Ub3AoKTsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDYzMDE1KQorKysgTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDctMDkg IEp1bGllIFBhcmVudCAgPGpwYXJlbnRAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENyYXNoIGluIHJlcGxhY2VTZWxlY3Rpb25D b21tYW5kIHdpdGggUlRMIHRleHQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD00MTQ4NQorCisgICAgICAgIEFkZHMgdGVzdHMgZm9yIDQgY2FzZXM6IGxh dGluIHRleHQgcGx1cyBzcGFjZSBpbiBSVEwgcmVnaW9uIGFuZCBMVFIgcmVnaW9uLAorICAgICAg ICBhbmQgaGVicmV3IHRleHQgcGx1cyBzcGFjZSBpbiBSVEwgcmVnaW9uIGFuZCBMVFIgcmVnaW9u LiAgQ3VycmVudGx5LCB0aGUKKyAgICAgICAgbGF0aW4gdGV4dCBpbiBSVEwgcmVnaW9uIGNhc2Ug Y3Jhc2hlcy4gIEFkZGVkIGFsbCBjb21iaW5hdGlvbnMgb2YgdGVzdCBzaW5jZQorICAgICAgICBl YXJsaWVyIHBhdGNoIGNyYXNoZWQgd2l0aCBoZWJyZXcgdGV4dCBpbiBMVFIgcmVnaW9uLgorICAg ICAgICAKKyAgICAgICAgKiBlZGl0aW5nL2V4ZWNDb21tYW5kL2luc2VydC1pbWFnZS1vbi10b3At b2YtZGlyZWN0aW9uYWwtdGV4dC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGVkaXRp bmcvZXhlY0NvbW1hbmQvaW5zZXJ0LWltYWdlLW9uLXRvcC1vZi1kaXJlY3Rpb25hbC10ZXh0Lmh0 bWw6IEFkZGVkLgorCiAyMDEwLTA3LTA5ICBUb255IEdlbnRpbGNvcmUgIDx0b255Z0BjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpJbmRleDogTGF5 b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9pbnNlcnQtaW1hZ2Utb24tdG9wLW9mLWRpcmVj dGlvbmFsLXRleHQtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2VkaXRp bmcvZXhlY0NvbW1hbmQvaW5zZXJ0LWltYWdlLW9uLXRvcC1vZi1kaXJlY3Rpb25hbC10ZXh0LWV4 cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1h bmQvaW5zZXJ0LWltYWdlLW9uLXRvcC1vZi1kaXJlY3Rpb25hbC10ZXh0LWV4cGVjdGVkLnR4dAko cmV2aXNpb24gMCkKQEAgLTAsMCArMSw1IEBACitUaGlzIHRlc3QgdXNlcyBleGVjQ29tbWFuZCgn aW5zZXJ0SW1hZ2UnKSB0byByZXBsYWNlIHRoZSBzZWxlY3Rpb24gaW4gYSB2YXJpZXR5IG9mIG1p eGVkIGRpcmVjdGlvbmFsaXR5IHRleHQuIElmIHRoaXMgZG9lc24ndCBjcmFzaCwgdGhlbiB0aGUg dGVzdCBwYXNzZXMuCisgCisgCisgCisgCkluZGV4OiBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWND b21tYW5kL2luc2VydC1pbWFnZS1vbi10b3Atb2YtZGlyZWN0aW9uYWwtdGV4dC5odG1sCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvaW5zZXJ0LWltYWdlLW9u LXRvcC1vZi1kaXJlY3Rpb25hbC10ZXh0Lmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0 cy9lZGl0aW5nL2V4ZWNDb21tYW5kL2luc2VydC1pbWFnZS1vbi10b3Atb2YtZGlyZWN0aW9uYWwt dGV4dC5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDIyIEBACivvu788ZGl2PlRoaXMgdGVz dCB1c2VzIGV4ZWNDb21tYW5kKCdpbnNlcnRJbWFnZScpIHRvIHJlcGxhY2UgdGhlIHNlbGVjdGlv biBpbiBhIHZhcmlldHkgb2YgbWl4ZWQgZGlyZWN0aW9uYWxpdHkgdGV4dC4gIElmIHRoaXMgZG9l c24ndCBjcmFzaCwgdGhlbiB0aGUgdGVzdCBwYXNzZXMuPC9kaXY+DQorPGRpdiBkaXI9J3J0bCcg aWQ9J3J0bDEnIHN0eWxlPSd3aGl0ZS1zcGFjZTpwcmUnIGNvbnRlbnRFZGl0YWJsZT50aGUgPC9k aXY+DQorPGRpdiBkaXI9J3J0bCcgaWQ9J3J0bDInIHN0eWxlPSd3aGl0ZS1zcGFjZTpwcmUnIGNv bnRlbnRFZGl0YWJsZT7XkNeX16ogPC9kaXY+DQorPGRpdiBkaXI9J2x0cicgaWQ9J2x0cjEnIHN0 eWxlPSd3aGl0ZS1zcGFjZTpwcmUnIGNvbnRlbnRFZGl0YWJsZT50aGUgPC9kaXY+DQorPGRpdiBk aXI9J2x0cicgaWQ9J2x0cjInIHN0eWxlPSd3aGl0ZS1zcGFjZTpwcmUnIGNvbnRlbnRFZGl0YWJs ZT7XkNeX16ogPC9kaXY+DQorPHNjcmlwdD4NCitpZiAod2luZG93LmxheW91dFRlc3RDb250cm9s bGVyKQ0KKyAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOw0KKw0KKy8vIFNl bGVjdCBvbmx5ICJ0aGUiLCBub3QgdGhlIHNwYWNlLCBMVFIgdGV4dCBpbiBSVEwgcmVnaW9uLg0K K2RvY3VtZW50LmdldFNlbGVjdGlvbigpLnNldEJhc2VBbmRFeHRlbnQocnRsMS5maXJzdENoaWxk LCAwLCBydGwxLmZpcnN0Q2hpbGQsIDMpOw0KK2RvY3VtZW50LmV4ZWNDb21tYW5kKCdJbnNlcnRJ bWFnZScsIGZhbHNlLCAiLi4vcmVzb3VyY2VzL2FiZS5wbmciKTsNCisvLyBTZWxlY3Qgb25seSAi 15DXl9eqIiwgbm90IHRoZSBzcGFjZSwgUlRMIHRleHQgaW4gUlRMIHJlZ2lvbi4NCitkb2N1bWVu dC5nZXRTZWxlY3Rpb24oKS5zZXRCYXNlQW5kRXh0ZW50KHJ0bDIuZmlyc3RDaGlsZCwgMCwgcnRs Mi5maXJzdENoaWxkLCAzKTsNCitkb2N1bWVudC5leGVjQ29tbWFuZCgnSW5zZXJ0SW1hZ2UnLCBm YWxzZSwgIi4uL3Jlc291cmNlcy9hYmUucG5nIik7DQorLy8gU2VsZWN0IG9ubHkgInRoZSIsIG5v dCB0aGUgc3BhY2UsIExUUiB0ZXh0IGluIExUUiByZWdpb24uDQorZG9jdW1lbnQuZ2V0U2VsZWN0 aW9uKCkuc2V0QmFzZUFuZEV4dGVudChsdHIxLmZpcnN0Q2hpbGQsIDAsIGx0cjEuZmlyc3RDaGls ZCwgMyk7DQorZG9jdW1lbnQuZXhlY0NvbW1hbmQoJ0luc2VydEltYWdlJywgZmFsc2UsICIuLi9y ZXNvdXJjZXMvYWJlLnBuZyIpOw0KKy8vIFNlbGVjdCBvbmx5ICLXkNeX16oiLCBub3QgdGhlIHNw YWNlLCBSVEwgdGV4dCBpbiBMVFIgcmVnaW9uLg0KK2RvY3VtZW50LmdldFNlbGVjdGlvbigpLnNl dEJhc2VBbmRFeHRlbnQobHRyMi5maXJzdENoaWxkLCAwLCBsdHIyLmZpcnN0Q2hpbGQsIDMpOw0K K2RvY3VtZW50LmV4ZWNDb21tYW5kKCdJbnNlcnRJbWFnZScsIGZhbHNlLCAiLi4vcmVzb3VyY2Vz L2FiZS5wbmciKTsNCis8L3NjcmlwdD4NCg==