38232 2010-04-27 17:10:11 -0700 REGRESSION: crash in WebCore::CompositeEditCommand::splitTreeToNode when indenting in an empty li 2010-05-18 20:30:43 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P5 Normal --- 1 ojan webkit-unassigned adele enrica jparent rniwa tony oldest_to_newest 218061 0 54477 ojan 2010-04-27 17:10:11 -0700 Created attachment 54477 test case Encountered in Google Docs. See http://crbug.com/42633 for more details. Test case attached. Regression range: 53845:53990 Likely a result of http://trac.webkit.org/changeset/53927. Possibly related to bug 38231 even though that's not a recent regression. 218196 1 54522 tony 2010-04-27 22:16:14 -0700 Created attachment 54522 Patch 218200 2 tony 2010-04-27 22:19:42 -0700 (In reply to comment #0) > Likely a result of http://trac.webkit.org/changeset/53927. Yup, that change was completely wrong. The guy who wrote it didn't know what he was doing. Hopefully that guy understands this better now. The new patch reverts r53927 and adds a comment explaining what the code is supposed to do. It includes a new fix to the problem. The problem was that some nodes are block elements even though they can't contain text or other elements (e.g., <hr>). In this case, we would try to split the <hr>, but that doesn't make sense. Rather than try to split, we just treat the individual node as a block. 218396 3 54522 ojan 2010-04-28 07:47:24 -0700 Comment on attachment 54522 Patch The code changes look correct to me. > +++ b/LayoutTests/editing/execCommand/crash-indenting-list-item.html > @@ -0,0 +1,9 @@ > +<div contentEditable><ul><li id='foo'></li></ul></div> > +<script> > +if (window.layoutTestController) > + layoutTestController.dumpAsText(); > +window.getSelection().setBaseAndExtent(foo, 0, foo, 0); > +// This test passes if it does not crash. > +document.execCommand('indent', false, null); > +document.getElementById("foo").innerText = "PASSED"; > +</script> We now have dump-as-markup that's perfect for something like this. Ideally this test would also show that the li got indented (which dump-as-markup would show). All you need to do to make this work with dump-as-markup is add the following to the top of the file: <script src="../../resources/dump-as-markup.js"></script> 221452 4 55199 tony 2010-05-05 20:04:56 -0700 Created attachment 55199 Patch 221453 5 tony 2010-05-05 20:05:28 -0700 (In reply to comment #4) > Created an attachment (id=55199) [details] > Patch Switched to a dump-as-markup test as Ojan suggested. 227382 6 55199 ojan 2010-05-18 10:53:49 -0700 Comment on attachment 55199 Patch This looks good. The old code was clearly violating an assert in splitTreeToNode. I would bet that an audit of call calls to splitTreeToNode would find other cases like this. I almost wonder if splitTreeToNode should just deal with this case (i.e. not split and just return the passed in Node), but I'm on the fence. This is certainly fine as a fix to the crash. 227638 7 tony 2010-05-18 20:30:43 -0700 Committed r59739: <http://trac.webkit.org/changeset/59739> 54477 2010-04-27 17:10:11 -0700 2010-04-27 17:10:11 -0700 test case scratch.html text/html 174 ojan PGRpdiBjb250ZW50RWRpdGFibGU+PHVsPjxsaSBpZD0nZm9vJz48L2xpPjwvdWw+PC9kaXY+Cjxz Y3JpcHQ+CndpbmRvdy5nZXRTZWxlY3Rpb24oKS5zZXRCYXNlQW5kRXh0ZW50KGZvbywgMCwgZm9v LCAwKTsKZG9jdW1lbnQuZXhlY0NvbW1hbmQoJ2luZGVudCcsIGZhbHNlLCBudWxsKTsKPC9zY3Jp cHQ+ 54522 2010-04-27 22:16:14 -0700 2010-05-05 20:04:49 -0700 Patch bug-38232-20100428141612.patch text/plain 4382 tony ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhZWM1Njk5MmNkMmI3ODI0YTY5OTc0MTA1YTQ0MTliOWM1YTUzMWQxLi5iMzUwOGU1 NzUyYWVmMDNiZTdlMmFmNzU3NTgzNjAwOTYyOGRkNjA4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTAtMDQtMjcgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSRUdSRVNTSU9OOiBjcmFzaCBp biBXZWJDb3JlOjpDb21wb3NpdGVFZGl0Q29tbWFuZDo6c3BsaXRUcmVlVG9Ob2RlIHdoZW4gaW5k ZW50aW5nIGluIGFuIGVtcHR5IGxpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0zODIzMgorCisgICAgICAgICogZWRpdGluZy9leGVjQ29tbWFuZC9jcmFz aC1pbmRlbnRpbmctbGlzdC1pdGVtLWV4cGVjdGVkLnR4dDogQ29waWVkIGZyb20gTGF5b3V0VGVz dHMvZWRpdGluZy9leGVjQ29tbWFuZC9pbmRlbnQtYmxvY2staW4tbGlzdC1leHBlY3RlZC50eHQu CisgICAgICAgICogZWRpdGluZy9leGVjQ29tbWFuZC9jcmFzaC1pbmRlbnRpbmctbGlzdC1pdGVt Lmh0bWw6IEFkZGVkLgorCiAyMDEwLTA0LTI3ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJA YXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IHRoZSBpbmltaXRhYmxlIERhbiBCZXJu c3RlaW4uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL2NyYXNo LWluZGVudGluZy1saXN0LWl0ZW0tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9l eGVjQ29tbWFuZC9jcmFzaC1pbmRlbnRpbmctbGlzdC1pdGVtLWV4cGVjdGVkLnR4dApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi41M2NkZjFlOTM5MzJjYTE3NDI1YTM0ZWMxYTYxNWE4M2RmMzhiYWQ5Ci0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9jcmFzaC1pbmRlbnRpbmct bGlzdC1pdGVtLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxIEBACitQQVNTRUQKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvY3Jhc2gtaW5kZW50aW5nLWxpc3QtaXRl bS5odG1sIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9jcmFzaC1pbmRlbnRpbmct bGlzdC1pdGVtLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYTRmZjI5ZDQ1NDI3NjE3MDU0M2Q5YTA0NTA5Y2Uw YWZjNmI1ZjQ4NgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2VkaXRpbmcvZXhlY0Nv bW1hbmQvY3Jhc2gtaW5kZW50aW5nLWxpc3QtaXRlbS5odG1sCkBAIC0wLDAgKzEsOSBAQAorPGRp diBjb250ZW50RWRpdGFibGU+PHVsPjxsaSBpZD0nZm9vJz48L2xpPjwvdWw+PC9kaXY+Cis8c2Ny aXB0PgoraWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICBsYXlvdXRUZXN0Q29u dHJvbGxlci5kdW1wQXNUZXh0KCk7Cit3aW5kb3cuZ2V0U2VsZWN0aW9uKCkuc2V0QmFzZUFuZEV4 dGVudChmb28sIDAsIGZvbywgMCk7CisvLyBUaGlzIHRlc3QgcGFzc2VzIGlmIGl0IGRvZXMgbm90 IGNyYXNoLgorZG9jdW1lbnQuZXhlY0NvbW1hbmQoJ2luZGVudCcsIGZhbHNlLCBudWxsKTsKK2Rv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCJmb28iKS5pbm5lclRleHQgPSAiUEFTU0VEIjsKKzwvc2Ny aXB0PgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwpp bmRleCBmZjI2MWY2ZDQxYTQ2YmNiM2RkNWQ5MGUzZGY3MGE5ZTllNWQ2MTgyLi45MWNjMTE2MWM0 ZWMyNDQzZDk5OGNmNjMwZmM2Yzg2ZjY2YWNiYTJjIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5n ZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEwLTA0LTI3 ICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUkVHUkVTU0lPTjogY3Jhc2ggaW4gV2ViQ29yZTo6 Q29tcG9zaXRlRWRpdENvbW1hbmQ6OnNwbGl0VHJlZVRvTm9kZSB3aGVuIGluZGVudGluZyBpbiBh biBlbXB0eSBsaQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MzgyMzIKKworICAgICAgICBUZXN0OiBlZGl0aW5nL2V4ZWNDb21tYW5kL2NyYXNoLWluZGVu dGluZy1saXN0LWl0ZW0uaHRtbAorCisgICAgICAgICogZWRpdGluZy9JbmRlbnRPdXRkZW50Q29t bWFuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbmRlbnRPdXRkZW50Q29tbWFuZDo6dHJ5SW5k ZW50aW5nQXNMaXN0SXRlbSk6CisgICAgICAgIChXZWJDb3JlOjpJbmRlbnRPdXRkZW50Q29tbWFu ZDo6aW5kZW50SW50b0Jsb2NrcXVvdGUpOgorCiAyMDEwLTA0LTI3ICBTaW1vbiBGcmFzZXIgIDxz aW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IHRoZSBpbmltaXRh YmxlIERhbiBCZXJuc3RlaW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL2VkaXRpbmcvSW5kZW50T3V0 ZGVudENvbW1hbmQuY3BwIGIvV2ViQ29yZS9lZGl0aW5nL0luZGVudE91dGRlbnRDb21tYW5kLmNw cAppbmRleCAwZjM5NzViMGMxM2Y2ZThlOTNlMzJlOGM2NTlhYjNiNzdiNDYzZjM5Li45ODMwY2Ew MWQ2MmMwZDQ4MzgzZjQxNjE4MTNiM2Y4MzhkZDUzZTg4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2Vk aXRpbmcvSW5kZW50T3V0ZGVudENvbW1hbmQuY3BwCisrKyBiL1dlYkNvcmUvZWRpdGluZy9JbmRl bnRPdXRkZW50Q29tbWFuZC5jcHAKQEAgLTc1LDEyICs3NSw4IEBAIGJvb2wgSW5kZW50T3V0ZGVu dENvbW1hbmQ6OnRyeUluZGVudGluZ0FzTGlzdEl0ZW0oY29uc3QgVmlzaWJsZVBvc2l0aW9uJiBl bmRPZkN1CiAgICAgaWYgKCFsaXN0Tm9kZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAg Ly8gRmluZCB0aGUgbGlzdCBpdGVtIGVuY2xvc2luZyB0aGUgY3VycmVudCBwYXJhZ3JhcGgKKyAg ICAvLyBGaW5kIHRoZSBibG9jayB0aGF0IHdlIHdhbnQgdG8gaW5kZW50LiAgSWYgaXQncyBub3Qg YSBsaXN0IGl0ZW0gKGUuZy4sIGEgZGl2IGluc2lkZSBhIGxpc3QgaXRlbSksIHdlIGJhaWwgb3V0 LgogICAgIEVsZW1lbnQqIHNlbGVjdGVkTGlzdEl0ZW0gPSBzdGF0aWNfY2FzdDxFbGVtZW50Kj4o ZW5jbG9zaW5nQmxvY2sobGFzdE5vZGVJblNlbGVjdGVkUGFyYWdyYXBoKSk7Ci0gICAgLy8gRklY TUU6IGVuY2xvc2luZ0Jsb2NrIHNob3VsZG4ndCByZXR1cm4gdGhlIHBhc3NlZCBpbiBlbGVtZW50 LiAgU2VlIHRoZQotICAgIC8vIGNvbW1lbnQgb24gdGhlIGZ1bmN0aW9uIGFib3V0IGhvdyB0byBm aXggcmF0aGVyIHRoYW4gaGF2aW5nIHRvIGFkanVzdCBoZXJlLgotICAgIGlmIChzZWxlY3RlZExp c3RJdGVtID09IGxhc3ROb2RlSW5TZWxlY3RlZFBhcmFncmFwaCkKLSAgICAgICAgc2VsZWN0ZWRM aXN0SXRlbSA9IHN0YXRpY19jYXN0PEVsZW1lbnQqPihlbmNsb3NpbmdCbG9jayhsYXN0Tm9kZUlu U2VsZWN0ZWRQYXJhZ3JhcGgtPnBhcmVudE5vZGUoKSkpOwogCiAgICAgLy8gRklYTUU6IHdlIG5l ZWQgdG8gZGVhbCB3aXRoIHRoZSBjYXNlIHdoZXJlIHRoZXJlIGlzIG5vIGxpIChtYWxmb3JtZWQg SFRNTCkKICAgICBpZiAoIXNlbGVjdGVkTGlzdEl0ZW0tPmhhc1RhZ05hbWUobGlUYWcpKQpAQCAt MTE3LDcgKzExMyw3IEBAIHZvaWQgSW5kZW50T3V0ZGVudENvbW1hbmQ6OmluZGVudEludG9CbG9j a3F1b3RlKGNvbnN0IFZpc2libGVQb3NpdGlvbiYgZW5kT2ZDdXJyCiAgICAgZWxzZQogICAgICAg ICBub2RlVG9TcGxpdFRvID0gZWRpdGFibGVSb290Rm9yUG9zaXRpb24oc3RhcnQpOwogCi0gICAg UmVmUHRyPE5vZGU+IG91dGVyQmxvY2sgPSBzcGxpdFRyZWVUb05vZGUoc3RhcnQubm9kZSgpLCBu b2RlVG9TcGxpdFRvKTsKKyAgICBSZWZQdHI8Tm9kZT4gb3V0ZXJCbG9jayA9IChzdGFydC5ub2Rl KCkgPT0gbm9kZVRvU3BsaXRUbykgPyBzdGFydC5ub2RlKCkgOiBzcGxpdFRyZWVUb05vZGUoc3Rh cnQubm9kZSgpLCBub2RlVG9TcGxpdFRvKTsKIAogICAgIGlmICghdGFyZ2V0QmxvY2txdW90ZSkg ewogICAgICAgICAvLyBDcmVhdGUgYSBuZXcgYmxvY2txdW90ZSBhbmQgaW5zZXJ0IGl0IGFzIGEg Y2hpbGQgb2YgdGhlIHJvb3QgZWRpdGFibGUgZWxlbWVudC4gV2UgYWNjb21wbGlzaAo= 55199 2010-05-05 20:04:56 -0700 2010-05-18 10:53:49 -0700 Patch bug-38232-20100506120454.patch text/plain 4763 tony ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwZTk0ZWI1Y2YyZjc0YzExNzVjOTQ4ODI1NjRjMWU0MTE4OTVkZDM4Li44NjY4OTcx NzE1NTRlNDg3NGI4NWVlYmVlZGU4MDZiNDY2YTg2ZjgzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTAtMDUtMDUgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSRUdSRVNTSU9OOiBjcmFzaCBp biBXZWJDb3JlOjpDb21wb3NpdGVFZGl0Q29tbWFuZDo6c3BsaXRUcmVlVG9Ob2RlIHdoZW4gaW5k ZW50aW5nIGluIGFuIGVtcHR5IGxpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0zODIzMgorCisgICAgICAgICogZWRpdGluZy9leGVjQ29tbWFuZC9jcmFz aC1pbmRlbnRpbmctbGlzdC1pdGVtLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZWRp dGluZy9leGVjQ29tbWFuZC9jcmFzaC1pbmRlbnRpbmctbGlzdC1pdGVtLmh0bWw6IEFkZGVkLgor CiAyMDEwLTA1LTA1ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFVucmV2aWV3ZWQsIGV4cGVjdGF0aW9ucyBjaGFuZ2UuCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL2NyYXNoLWluZGVudGluZy1saXN0LWl0ZW0tZXhwZWN0 ZWQudHh0IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9jcmFzaC1pbmRlbnRpbmct bGlzdC1pdGVtLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5kMzQ5ZDU3Y2JmM2JhOWJmYjNkYTk4 ZjEyNjFlMTBlOTFhOTZmZjE3Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGlu Zy9leGVjQ29tbWFuZC9jcmFzaC1pbmRlbnRpbmctbGlzdC1pdGVtLWV4cGVjdGVkLnR4dApAQCAt MCwwICsxLDI5IEBACisKKzxIVE1MPgorPEhFQUQ+Cis8L0hFQUQ+Cis8Qk9EWT4KKzxESVYgY29u dGVudEVkaXRhYmxlPSIiPgorPFVMPgorPFVMPgorPExJIGlkPSJmb28iPgorPCN0ZXh0PlBBU1NF RDwvI3RleHQ+Cis8L0xJPgorPC9VTD4KKzwvVUw+Cis8L0RJVj4KKzwjdGV4dD4KKzwvI3RleHQ+ Cis8U0NSSVBUIHNyYz0iLi4vLi4vcmVzb3VyY2VzL2R1bXAtYXMtbWFya3VwLmpzIj48L1NDUklQ VD4KKzwjdGV4dD4KKzwvI3RleHQ+Cis8U0NSSVBUPgord2luZG93LmdldFNlbGVjdGlvbigpLnNl dEJhc2VBbmRFeHRlbnQoZm9vLCAwLCBmb28sIDApOworLy8gVGhpcyB0ZXN0IHBhc3NlcyBpZiBp dCBkb2VzIG5vdCBjcmFzaC4KK2RvY3VtZW50LmV4ZWNDb21tYW5kKCdpbmRlbnQnLCBmYWxzZSwg bnVsbCk7Citkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZm9vIikuaW5uZXJUZXh0ID0gIlBBU1NF RCI7Cis8L1NDUklQVD4KKzwjdGV4dD4KKzwvI3RleHQ+Cis8L0JPRFk+Cis8L0hUTUw+CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL2NyYXNoLWluZGVudGluZy1s aXN0LWl0ZW0uaHRtbCBiL0xheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvY3Jhc2gtaW5k ZW50aW5nLWxpc3QtaXRlbS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjExY2NhZDQ0Nzc2YzU1NWM0NDY3Mzdh MTNhOTMyNmE2NTQ0MDdhOWMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5n L2V4ZWNDb21tYW5kL2NyYXNoLWluZGVudGluZy1saXN0LWl0ZW0uaHRtbApAQCAtMCwwICsxLDgg QEAKKzxkaXYgY29udGVudEVkaXRhYmxlPjx1bD48bGkgaWQ9J2Zvbyc+PC9saT48L3VsPjwvZGl2 PgorPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9kdW1wLWFzLW1hcmt1cC5qcyI+PC9zY3Jp cHQ+Cis8c2NyaXB0Pgord2luZG93LmdldFNlbGVjdGlvbigpLnNldEJhc2VBbmRFeHRlbnQoZm9v LCAwLCBmb28sIDApOworLy8gVGhpcyB0ZXN0IHBhc3NlcyBpZiBpdCBkb2VzIG5vdCBjcmFzaC4K K2RvY3VtZW50LmV4ZWNDb21tYW5kKCdpbmRlbnQnLCBmYWxzZSwgbnVsbCk7Citkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgiZm9vIikuaW5uZXJUZXh0ID0gIlBBU1NFRCI7Cis8L3NjcmlwdD4KZGlm ZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzRi OWU4Y2YzMjU1Yzk2ZGNmYjdiNTcyNzA5OGQ3ZTRiMDI3OTNmMi4uMjA4N2E1N2I5MDU2MzBiMWFh MGNiODdlYWM3MzRmZDBkMzdhNTc1ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysr IGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0wNS0wNSAgVG9ueSBD aGFuZyAgPHRvbnlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFJFR1JFU1NJT046IGNyYXNoIGluIFdlYkNvcmU6OkNvbXBvc2l0 ZUVkaXRDb21tYW5kOjpzcGxpdFRyZWVUb05vZGUgd2hlbiBpbmRlbnRpbmcgaW4gYW4gZW1wdHkg bGkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4MjMy CisKKyAgICAgICAgVGVzdDogZWRpdGluZy9leGVjQ29tbWFuZC9jcmFzaC1pbmRlbnRpbmctbGlz dC1pdGVtLmh0bWwKKworICAgICAgICAqIGVkaXRpbmcvSW5kZW50T3V0ZGVudENvbW1hbmQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SW5kZW50T3V0ZGVudENvbW1hbmQ6OnRyeUluZGVudGluZ0Fz TGlzdEl0ZW0pOgorICAgICAgICAoV2ViQ29yZTo6SW5kZW50T3V0ZGVudENvbW1hbmQ6OmluZGVu dEludG9CbG9ja3F1b3RlKToKKwogMjAxMC0wNS0wNSAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBw bGUuY29tPgogCiAgICAgICAgIEZpeCB0aGUgZGVjZWxlcmF0ZWQgY29tcG9zaXRpbmcgYnVpbGQu CmRpZmYgLS1naXQgYS9XZWJDb3JlL2VkaXRpbmcvSW5kZW50T3V0ZGVudENvbW1hbmQuY3BwIGIv V2ViQ29yZS9lZGl0aW5nL0luZGVudE91dGRlbnRDb21tYW5kLmNwcAppbmRleCAwZjM5NzViMGMx M2Y2ZThlOTNlMzJlOGM2NTlhYjNiNzdiNDYzZjM5Li45ODMwY2EwMWQ2MmMwZDQ4MzgzZjQxNjE4 MTNiM2Y4MzhkZDUzZTg4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2VkaXRpbmcvSW5kZW50T3V0ZGVu dENvbW1hbmQuY3BwCisrKyBiL1dlYkNvcmUvZWRpdGluZy9JbmRlbnRPdXRkZW50Q29tbWFuZC5j cHAKQEAgLTc1LDEyICs3NSw4IEBAIGJvb2wgSW5kZW50T3V0ZGVudENvbW1hbmQ6OnRyeUluZGVu dGluZ0FzTGlzdEl0ZW0oY29uc3QgVmlzaWJsZVBvc2l0aW9uJiBlbmRPZkN1CiAgICAgaWYgKCFs aXN0Tm9kZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgLy8gRmluZCB0aGUgbGlzdCBp dGVtIGVuY2xvc2luZyB0aGUgY3VycmVudCBwYXJhZ3JhcGgKKyAgICAvLyBGaW5kIHRoZSBibG9j ayB0aGF0IHdlIHdhbnQgdG8gaW5kZW50LiAgSWYgaXQncyBub3QgYSBsaXN0IGl0ZW0gKGUuZy4s IGEgZGl2IGluc2lkZSBhIGxpc3QgaXRlbSksIHdlIGJhaWwgb3V0LgogICAgIEVsZW1lbnQqIHNl bGVjdGVkTGlzdEl0ZW0gPSBzdGF0aWNfY2FzdDxFbGVtZW50Kj4oZW5jbG9zaW5nQmxvY2sobGFz dE5vZGVJblNlbGVjdGVkUGFyYWdyYXBoKSk7Ci0gICAgLy8gRklYTUU6IGVuY2xvc2luZ0Jsb2Nr IHNob3VsZG4ndCByZXR1cm4gdGhlIHBhc3NlZCBpbiBlbGVtZW50LiAgU2VlIHRoZQotICAgIC8v IGNvbW1lbnQgb24gdGhlIGZ1bmN0aW9uIGFib3V0IGhvdyB0byBmaXggcmF0aGVyIHRoYW4gaGF2 aW5nIHRvIGFkanVzdCBoZXJlLgotICAgIGlmIChzZWxlY3RlZExpc3RJdGVtID09IGxhc3ROb2Rl SW5TZWxlY3RlZFBhcmFncmFwaCkKLSAgICAgICAgc2VsZWN0ZWRMaXN0SXRlbSA9IHN0YXRpY19j YXN0PEVsZW1lbnQqPihlbmNsb3NpbmdCbG9jayhsYXN0Tm9kZUluU2VsZWN0ZWRQYXJhZ3JhcGgt PnBhcmVudE5vZGUoKSkpOwogCiAgICAgLy8gRklYTUU6IHdlIG5lZWQgdG8gZGVhbCB3aXRoIHRo ZSBjYXNlIHdoZXJlIHRoZXJlIGlzIG5vIGxpIChtYWxmb3JtZWQgSFRNTCkKICAgICBpZiAoIXNl bGVjdGVkTGlzdEl0ZW0tPmhhc1RhZ05hbWUobGlUYWcpKQpAQCAtMTE3LDcgKzExMyw3IEBAIHZv aWQgSW5kZW50T3V0ZGVudENvbW1hbmQ6OmluZGVudEludG9CbG9ja3F1b3RlKGNvbnN0IFZpc2li bGVQb3NpdGlvbiYgZW5kT2ZDdXJyCiAgICAgZWxzZQogICAgICAgICBub2RlVG9TcGxpdFRvID0g ZWRpdGFibGVSb290Rm9yUG9zaXRpb24oc3RhcnQpOwogCi0gICAgUmVmUHRyPE5vZGU+IG91dGVy QmxvY2sgPSBzcGxpdFRyZWVUb05vZGUoc3RhcnQubm9kZSgpLCBub2RlVG9TcGxpdFRvKTsKKyAg ICBSZWZQdHI8Tm9kZT4gb3V0ZXJCbG9jayA9IChzdGFydC5ub2RlKCkgPT0gbm9kZVRvU3BsaXRU bykgPyBzdGFydC5ub2RlKCkgOiBzcGxpdFRyZWVUb05vZGUoc3RhcnQubm9kZSgpLCBub2RlVG9T cGxpdFRvKTsKIAogICAgIGlmICghdGFyZ2V0QmxvY2txdW90ZSkgewogICAgICAgICAvLyBDcmVh dGUgYSBuZXcgYmxvY2txdW90ZSBhbmQgaW5zZXJ0IGl0IGFzIGEgY2hpbGQgb2YgdGhlIHJvb3Qg ZWRpdGFibGUgZWxlbWVudC4gV2UgYWNjb21wbGlzaAo=