24494 2009-03-10 10:13:00 -0700 crash when deleting at end of document and merging paragraphs 2009-03-10 12:32:09 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED HasReduction, InRadar P2 Normal --- 1 darin darin oldest_to_newest 113009 0 darin 2009-03-10 10:13:00 -0700 We have some crash reports that are due to paragraph merging at the end of a document. Easy to fix. 113010 1 darin 2009-03-10 10:13:19 -0700 <rdar://problem/6571537> 113011 2 28438 darin 2009-03-10 10:18:48 -0700 Created attachment 28438 patch 113019 3 28438 ap 2009-03-10 10:53:05 -0700 Comment on attachment 28438 patch r=me This function looks like a perfect candidate for using an early return. 113044 4 darin 2009-03-10 12:32:09 -0700 http://trac.webkit.org/changeset/41562 28438 2009-03-10 10:18:48 -0700 2009-03-10 10:53:05 -0700 patch DeleteEndPatch.txt text/plain 5407 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MTU1NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDktMDMtMTAgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyAy NDQ5NDogY3Jhc2ggd2hlbiBkZWxldGluZyBhdCBlbmQgb2YgZG9jdW1lbnQgYW5kIG1lcmdpbmcg cGFyYWdyYXBocworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjQ0OTQKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNjU3MTUzNworCisgICAgICAgIFRlc3Q6 IGVkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtYXQtZW5kLW9mLWRvY3VtZW50Lmh0bWwKKworICAgICAg ICAqIGRvbS9SYW5nZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSYW5nZTo6Y29tcGFyZUJvdW5k YXJ5UG9pbnRzKTogU3BsaXQgb3V0IGFzc2VydGlvbi4gSXQncyBiZXR0ZXIgbm90IHRvCisgICAg ICAgIHVzZSAmJiBpbiBhc3NlcnRpb25zIHNpbmNlIHdlJ2QgbGlrZSB0byBrbm93IHdoaWNoIGNv bmRpdGlvbiBpcyBmYWlsaW5nLgorCisgICAgICAgICogZWRpdGluZy9BcHBseVN0eWxlQ29tbWFu ZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBcHBseVN0eWxlQ29tbWFuZDo6YXBwbHlJbmxpbmVT dHlsZVRvUmFuZ2UpOiBBZGRlZCBhIG51bGwgY2hlY2sgYmVmb3JlCisgICAgICAgIGNhbGxpbmcg Y29tcGFyZUJvdW5kYXJ5UG9pbnRzLCBzaW5jZSBhIDAgZm9yIHRoZSBub2RlIGlzIGFtYmlndW91 cyBhbmQgc28gdGhlCisgICAgICAgIGZ1bmN0aW9uIGRvZXNuJ3Qga25vdyB3aGljaCB2YWx1ZSB0 byByZXR1cm4uCisKIDIwMDktMDMtMDYgIERhcmluIEZpc2hlciAgPGRhcmluQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDogV2ViQ29yZS9kb20v UmFuZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZG9tL1JhbmdlLmNwcAkocmV2aXNpb24g NDE1NTApCisrKyBXZWJDb3JlL2RvbS9SYW5nZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQzNiwx MSArNDM2LDE0IEBAIHNob3J0IFJhbmdlOjpjb21wYXJlQm91bmRhcnlQb2ludHMoQ29tcGEKIAog c2hvcnQgUmFuZ2U6OmNvbXBhcmVCb3VuZGFyeVBvaW50cyhOb2RlKiBjb250YWluZXJBLCBpbnQg b2Zmc2V0QSwgTm9kZSogY29udGFpbmVyQiwgaW50IG9mZnNldEIpCiB7Ci0gICAgQVNTRVJUKGNv bnRhaW5lckEgJiYgY29udGFpbmVyQik7CisgICAgQVNTRVJUKGNvbnRhaW5lckEpOworICAgIEFT U0VSVChjb250YWluZXJCKTsKKwogICAgIGlmICghY29udGFpbmVyQSkKICAgICAgICAgcmV0dXJu IC0xOwogICAgIGlmICghY29udGFpbmVyQikKICAgICAgICAgcmV0dXJuIDE7CisKICAgICAvLyBz ZWUgRE9NMiB0cmF2ZXJzYWwgJiByYW5nZSBzZWN0aW9uIDIuNQogCiAgICAgLy8gY2FzZSAxOiBi b3RoIHBvaW50cyBoYXZlIHRoZSBzYW1lIGNvbnRhaW5lcgpJbmRleDogV2ViQ29yZS9lZGl0aW5n L0FwcGx5U3R5bGVDb21tYW5kLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2VkaXRpbmcvQXBw bHlTdHlsZUNvbW1hbmQuY3BwCShyZXZpc2lvbiA0MTU1MCkKKysrIFdlYkNvcmUvZWRpdGluZy9B cHBseVN0eWxlQ29tbWFuZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg3MSw3ICs4NzEsNyBAQCB2 b2lkIEFwcGx5U3R5bGVDb21tYW5kOjphcHBseUlubGluZVN0eWxlCiAgICAgaWYgKHN0YXJ0Lm9m ZnNldCgpID49IGNhcmV0TWF4T2Zmc2V0KHN0YXJ0Lm5vZGUoKSkpIHsKICAgICAgICAgbm9kZSA9 IG5vZGUtPnRyYXZlcnNlTmV4dE5vZGUoKTsKICAgICAgICAgUG9zaXRpb24gbmV3U3RhcnQgPSBQ b3NpdGlvbihub2RlLCAwKTsKLSAgICAgICAgaWYgKFJhbmdlOjpjb21wYXJlQm91bmRhcnlQb2lu dHMoZW5kLCBuZXdTdGFydCkgPCAwKQorICAgICAgICBpZiAoIW5vZGUgfHwgUmFuZ2U6OmNvbXBh cmVCb3VuZGFyeVBvaW50cyhlbmQsIG5ld1N0YXJ0KSA8IDApCiAgICAgICAgICAgICByYW5nZUlz RW1wdHkgPSB0cnVlOwogICAgIH0KIApJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNDE1NTcpCisrKyBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAwOS0w My0xMCAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnVnIDI0NDk0OiBjcmFzaCB3aGVuIGRlbGV0 aW5nIGF0IGVuZCBvZiBkb2N1bWVudCBhbmQgbWVyZ2luZyBwYXJhZ3JhcGhzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDQ5NAorICAgICAgICByZGFy Oi8vcHJvYmxlbS82NTcxNTM3CisKKyAgICAgICAgKiBlZGl0aW5nL2RlbGV0aW5nL21lcmdlLWF0 LWVuZC1vZi1kb2N1bWVudC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGVkaXRpbmcv ZGVsZXRpbmcvbWVyZ2UtYXQtZW5kLW9mLWRvY3VtZW50Lmh0bWw6IEFkZGVkLgorCiAyMDA5LTAz LTEwICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBEYW4gQmVybnN0ZWluLgpJbmRleDogTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9tZXJn ZS1hdC1lbmQtb2YtZG9jdW1lbnQtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRl c3RzL2VkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtYXQtZW5kLW9mLWRvY3VtZW50LWV4cGVjdGVkLnR4 dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtYXQt ZW5kLW9mLWRvY3VtZW50LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw1IEBA CitUZXN0IGZvciBkZWxldGlvbiB0aGF0IGludm9sdmVzIHBhcmFncmFwaCBtZXJnaW5nIGF0IHRo ZSB2ZXJ5IGVuZCBvZiBhIGRvY3VtZW50LgorCitQQVNTOiBCYWNrc3BhY2UgZGVsZXRlZCBhIG5l d2xpbmUgYW5kIGRpZCBub3QgY2F1c2UgYSBjcmFzaC4KKworVGhlIHRlc3QgcHV0cyB0aGUgY3Vy c29yIGJlbG93IHRoaXMgcGFyYWdyYXBoIGFuZCBwZXJmb3JtcyBhIGRlbGV0ZS4KClByb3BlcnR5 IGNoYW5nZXMgb246IExheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtYXQtZW5kLW9m LWRvY3VtZW50LWV4cGVjdGVkLnR4dApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCk5hbWU6IHN2bjplb2wtc3R5bGUKICAg KyBuYXRpdmUKCkluZGV4OiBMYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL21lcmdlLWF0LWVu ZC1vZi1kb2N1bWVudC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2VkaXRpbmcvZGVs ZXRpbmcvbWVyZ2UtYXQtZW5kLW9mLWRvY3VtZW50Lmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlv dXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL21lcmdlLWF0LWVuZC1vZi1kb2N1bWVudC5odG1sCShy ZXZpc2lvbiAwKQpAQCAtMCwwICsxLDI3IEBACis8aGVhZD4KKzxzY3JpcHQ+CisKKy8vIENBVVRJ T046IFRoZXJlIG11c3QgYmUgbm8gbmV3bGluZSBhdCB0aGUgZW5kIG9mIHRoaXMgdGVzdCBmaWxl LgorLy8gQW4gYWRkaXRpb25hbCB0ZXh0IG5vZGUgYWZ0ZXIgdGhlIGJvZHkgd291bGQgcHJldmVu dCB0aGUgY3Jhc2guCisKK2Z1bmN0aW9uIHRlc3QoKQoreworICAgIGlmICh3aW5kb3cubGF5b3V0 VGVzdENvbnRyb2xsZXIpCisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQo KTsKKyAgICBkb2N1bWVudC5nZXRTZWxlY3Rpb24oKS5zZWxlY3RBbGxDaGlsZHJlbihkb2N1bWVu dC5ib2R5KTsKKyAgICBkb2N1bWVudC5nZXRTZWxlY3Rpb24oKS5jb2xsYXBzZVRvRW5kKCk7Cisg ICAgZG9jdW1lbnQuZXhlY0NvbW1hbmQoIkRlbGV0ZSIpOworICAgIHZhciByZXN1bHQ7CisgICAg aWYgKGRvY3VtZW50LmJvZHkuaW5uZXJUZXh0ID09PSAiVGVzdCBmb3IgZGVsZXRpb24gdGhhdCBp bnZvbHZlcyBwYXJhZ3JhcGggbWVyZ2luZyBhdCB0aGUgdmVyeSBlbmQgb2YgYSBkb2N1bWVudC5c blxuVEVTVCBIQVMgTk9UIFJVTiBZRVRcblxuVGhlIHRlc3QgcHV0cyB0aGUgY3Vyc29yIGJlbG93 IHRoaXMgcGFyYWdyYXBoIGFuZCBwZXJmb3JtcyBhIGRlbGV0ZS4iKQorICAgICAgICByZXN1bHQg PSAiUEFTUzogQmFja3NwYWNlIGRlbGV0ZWQgYSBuZXdsaW5lIGFuZCBkaWQgbm90IGNhdXNlIGEg Y3Jhc2guIjsKKyAgICBlbHNlCisgICAgICAgIHJlc3VsdCA9ICJGQUlMOiBUaGUgZG9jdW1lbnQn cyBpbm5lclRleHQgaXMgaW5jb3JyZWN0LiI7CisgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo InJlc3VsdCIpLmlubmVySFRNTCA9IHJlc3VsdDsKK30KKworPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8 Ym9keSBjb250ZW50ZWRpdGFibGUgb25sb2FkPSJ0ZXN0KCkiPgorPHA+VGVzdCBmb3IgZGVsZXRp b24gdGhhdCBpbnZvbHZlcyBwYXJhZ3JhcGggbWVyZ2luZyBhdCB0aGUgdmVyeSBlbmQgb2YgYSBk b2N1bWVudC48L3A+Cis8cCBpZD0icmVzdWx0Ij5URVNUIEhBUyBOT1QgUlVOIFlFVDwvcD4KKzxw cmU+VGhlIHRlc3QgcHV0cyB0aGUgY3Vyc29yIGJlbG93IHRoaXMgcGFyYWdyYXBoIGFuZCBwZXJm b3JtcyBhIGRlbGV0ZS48L3ByZT48YnI+PC9ib2R5PgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZp bGUKClByb3BlcnR5IGNoYW5nZXMgb246IExheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvbWVy Z2UtYXQtZW5kLW9mLWRvY3VtZW50Lmh0bWwKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpOYW1lOiBzdm46bWltZS10eXBl CiAgICsgdGV4dC9odG1sCk5hbWU6IHN2bjplb2wtc3R5bGUKICAgKyBuYXRpdmUKCg==