209966 2020-04-03 08:19:57 -0700 REGRESSION(r259401): [GTK] Check surroundingRange is not null 2020-04-07 13:50:34 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=209723 https://bugs.webkit.org/show_bug.cgi?id=210149 InRadar P2 Normal --- 209723 1 dpino dpino clopez darin pnormand webkit-bug-importer oldest_to_newest 1637358 0 dpino 2020-04-03 08:19:57 -0700 REGRESSION(r259401): [GTK] Check surroundingRange is not null 1637359 1 395377 dpino 2020-04-03 08:20:29 -0700 Created attachment 395377 Patch 1637366 2 395377 pnormand 2020-04-03 08:34:21 -0700 Comment on attachment 395377 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395377&action=review > Source/WebKit/WebProcess/WebPage/glib/WebPageGLib.cpp:116 > + if (surroundingRange != nullptr) We usually don't do explicit checks like this. Can you remove the `!= nullptr` part? > Source/WebKit/WebProcess/WebPage/glib/WebPageGLib.cpp:121 > + if (surroundingRange != nullptr) Ditto 1637377 3 395382 dpino 2020-04-03 09:00:51 -0700 Created attachment 395382 Patch 1637378 4 395382 darin 2020-04-03 09:04:39 -0700 Comment on attachment 395382 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395382&action=review > Source/WebKit/WebProcess/WebPage/glib/WebPageGLib.cpp:117 > surroundingRange->setEnd(compositionRange->startPosition()); > clonedRange->setStart(compositionRange->endPosition()); > - postLayoutData.surroundingContext = plainText(*surroundingRange) + plainText(clonedRange); > + if (surroundingRange) > + postLayoutData.surroundingContext = plainText(*surroundingRange) + plainText(clonedRange); This change isn’t needed. As you can see, surroundingRange is already used above and so it can’t be null by the time it gets here. > Source/WebKit/WebProcess/WebPage/glib/WebPageGLib.cpp:122 > - postLayoutData.surroundingContext = plainText(*surroundingRange); > + if (surroundingRange) > + postLayoutData.surroundingContext = plainText(*surroundingRange); This change looks OK. Sorry for missing it. To preserve historical behavior, could instead write: postLayoutData.surroundingContext = surroundingRange ? plainText(*surroundingRange) : emptyString(); The old code set the string to empty string, rather than leaving it with its previous value. 1637381 5 395383 dpino 2020-04-03 09:17:05 -0700 Created attachment 395383 Patch 1637402 6 ews-feeder 2020-04-03 09:54:17 -0700 Committed r259468: <https://trac.webkit.org/changeset/259468> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395383. 1637403 7 webkit-bug-importer 2020-04-03 09:55:14 -0700 <rdar://problem/61263510> 395377 2020-04-03 08:20:29 -0700 2020-04-03 09:00:48 -0700 Patch bug-209966-20200403172028.patch text/plain 2196 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NDU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDE1OTI0YmRiNmRiNzU3ZGIx MmZmMjc2MjBhMDlhZThjZmQ1MjQ4ZjEuLjdiOTYyNTIyZGE1YzdhNjE5ODIyNjZlZTY4ZGI2Zjc5 ODhlNzViZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDQtMDMgIERpZWdvIFBp bm8gR2FyY2lhICA8ZHBpbm9AaWdhbGlhLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OKHIyNTk0 MDEpOiBbR1RLXSBDaGVjayBzdXJyb3VuZGluZ1JhbmdlIGlzIG5vdCBudWxsCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk5NjYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFn ZS9nbGliL1dlYlBhZ2VHTGliLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6Z2V0UGxh dGZvcm1FZGl0b3JTdGF0ZSBjb25zdCk6CisKIDIwMjAtMDQtMDMgIEFkcmlhbiBQZXJleiBkZSBD YXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIGZpeCBhZnRl ciByMjU5MzgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9n bGliL1dlYlBhZ2VHTGliLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2ds aWIvV2ViUGFnZUdMaWIuY3BwCmluZGV4IDE2YjUzOGNmOTliNDUxYzI1NWE4NDEwZTZmYzliZDZi ODM2NjRjMzEuLjMwMGYzNzFlY2ViMzI4OGExY2JiNjZjMWMwYWQzOGJkZjllYjY1ZjQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2dsaWIvV2ViUGFnZUdMaWIu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2dsaWIvV2ViUGFnZUdM aWIuY3BwCkBAIC0xMTMsMTEgKzExMywxMyBAQCB2b2lkIFdlYlBhZ2U6OmdldFBsYXRmb3JtRWRp dG9yU3RhdGUoRnJhbWUmIGZyYW1lLCBFZGl0b3JTdGF0ZSYgcmVzdWx0KSBjb25zdAogICAgICAg ICAgICAgYXV0byBjbG9uZWRSYW5nZSA9IHN1cnJvdW5kaW5nUmFuZ2UtPmNsb25lUmFuZ2UoKTsK ICAgICAgICAgICAgIHN1cnJvdW5kaW5nUmFuZ2UtPnNldEVuZChjb21wb3NpdGlvblJhbmdlLT5z dGFydFBvc2l0aW9uKCkpOwogICAgICAgICAgICAgY2xvbmVkUmFuZ2UtPnNldFN0YXJ0KGNvbXBv c2l0aW9uUmFuZ2UtPmVuZFBvc2l0aW9uKCkpOwotICAgICAgICAgICAgcG9zdExheW91dERhdGEu c3Vycm91bmRpbmdDb250ZXh0ID0gcGxhaW5UZXh0KCpzdXJyb3VuZGluZ1JhbmdlKSArIHBsYWlu VGV4dChjbG9uZWRSYW5nZSk7CisgICAgICAgICAgICBpZiAoc3Vycm91bmRpbmdSYW5nZSAhPSBu dWxscHRyKQorICAgICAgICAgICAgICAgIHBvc3RMYXlvdXREYXRhLnN1cnJvdW5kaW5nQ29udGV4 dCA9IHBsYWluVGV4dCgqc3Vycm91bmRpbmdSYW5nZSkgKyBwbGFpblRleHQoY2xvbmVkUmFuZ2Up OwogICAgICAgICAgICAgcG9zdExheW91dERhdGEuc3Vycm91bmRpbmdDb250ZXh0Q3Vyc29yUG9z aXRpb24gPSBjaGFyYWN0ZXJDb3VudCgqc3Vycm91bmRpbmdSYW5nZSk7CiAgICAgICAgICAgICBw b3N0TGF5b3V0RGF0YS5zdXJyb3VuZGluZ0NvbnRleHRTZWxlY3Rpb25Qb3NpdGlvbiA9IHBvc3RM YXlvdXREYXRhLnN1cnJvdW5kaW5nQ29udGV4dEN1cnNvclBvc2l0aW9uOwogICAgICAgICB9IGVs c2UgewotICAgICAgICAgICAgcG9zdExheW91dERhdGEuc3Vycm91bmRpbmdDb250ZXh0ID0gcGxh aW5UZXh0KCpzdXJyb3VuZGluZ1JhbmdlKTsKKyAgICAgICAgICAgIGlmIChzdXJyb3VuZGluZ1Jh bmdlICE9IG51bGxwdHIpCisgICAgICAgICAgICAgICAgcG9zdExheW91dERhdGEuc3Vycm91bmRp bmdDb250ZXh0ID0gcGxhaW5UZXh0KCpzdXJyb3VuZGluZ1JhbmdlKTsKICAgICAgICAgICAgIGlm IChzdXJyb3VuZGluZ1N0YXJ0LmlzTnVsbCgpIHx8IHNlbGVjdGlvblN0YXJ0LmlzTnVsbCgpKQog ICAgICAgICAgICAgICAgIHBvc3RMYXlvdXREYXRhLnN1cnJvdW5kaW5nQ29udGV4dEN1cnNvclBv c2l0aW9uID0gMDsKICAgICAgICAgICAgIGVsc2UK 395382 2020-04-03 09:00:51 -0700 2020-04-03 09:17:02 -0700 Patch bug-209966-20200403180050.patch text/plain 2174 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NDU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDE1OTI0YmRiNmRiNzU3ZGIx MmZmMjc2MjBhMDlhZThjZmQ1MjQ4ZjEuLjdiOTYyNTIyZGE1YzdhNjE5ODIyNjZlZTY4ZGI2Zjc5 ODhlNzViZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDQtMDMgIERpZWdvIFBp bm8gR2FyY2lhICA8ZHBpbm9AaWdhbGlhLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OKHIyNTk0 MDEpOiBbR1RLXSBDaGVjayBzdXJyb3VuZGluZ1JhbmdlIGlzIG5vdCBudWxsCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk5NjYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFn ZS9nbGliL1dlYlBhZ2VHTGliLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6Z2V0UGxh dGZvcm1FZGl0b3JTdGF0ZSBjb25zdCk6CisKIDIwMjAtMDQtMDMgIEFkcmlhbiBQZXJleiBkZSBD YXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIGZpeCBhZnRl ciByMjU5MzgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9n bGliL1dlYlBhZ2VHTGliLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2ds aWIvV2ViUGFnZUdMaWIuY3BwCmluZGV4IDE2YjUzOGNmOTliNDUxYzI1NWE4NDEwZTZmYzliZDZi ODM2NjRjMzEuLmE0M2FjNzUzY2M3ZDU4Yjc5MGY1MzMyNmMxZGI2NmFmMDI5OGI0Y2UgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2dsaWIvV2ViUGFnZUdMaWIu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2dsaWIvV2ViUGFnZUdM aWIuY3BwCkBAIC0xMTMsMTEgKzExMywxMyBAQCB2b2lkIFdlYlBhZ2U6OmdldFBsYXRmb3JtRWRp dG9yU3RhdGUoRnJhbWUmIGZyYW1lLCBFZGl0b3JTdGF0ZSYgcmVzdWx0KSBjb25zdAogICAgICAg ICAgICAgYXV0byBjbG9uZWRSYW5nZSA9IHN1cnJvdW5kaW5nUmFuZ2UtPmNsb25lUmFuZ2UoKTsK ICAgICAgICAgICAgIHN1cnJvdW5kaW5nUmFuZ2UtPnNldEVuZChjb21wb3NpdGlvblJhbmdlLT5z dGFydFBvc2l0aW9uKCkpOwogICAgICAgICAgICAgY2xvbmVkUmFuZ2UtPnNldFN0YXJ0KGNvbXBv c2l0aW9uUmFuZ2UtPmVuZFBvc2l0aW9uKCkpOwotICAgICAgICAgICAgcG9zdExheW91dERhdGEu c3Vycm91bmRpbmdDb250ZXh0ID0gcGxhaW5UZXh0KCpzdXJyb3VuZGluZ1JhbmdlKSArIHBsYWlu VGV4dChjbG9uZWRSYW5nZSk7CisgICAgICAgICAgICBpZiAoc3Vycm91bmRpbmdSYW5nZSkKKyAg ICAgICAgICAgICAgICBwb3N0TGF5b3V0RGF0YS5zdXJyb3VuZGluZ0NvbnRleHQgPSBwbGFpblRl eHQoKnN1cnJvdW5kaW5nUmFuZ2UpICsgcGxhaW5UZXh0KGNsb25lZFJhbmdlKTsKICAgICAgICAg ICAgIHBvc3RMYXlvdXREYXRhLnN1cnJvdW5kaW5nQ29udGV4dEN1cnNvclBvc2l0aW9uID0gY2hh cmFjdGVyQ291bnQoKnN1cnJvdW5kaW5nUmFuZ2UpOwogICAgICAgICAgICAgcG9zdExheW91dERh dGEuc3Vycm91bmRpbmdDb250ZXh0U2VsZWN0aW9uUG9zaXRpb24gPSBwb3N0TGF5b3V0RGF0YS5z dXJyb3VuZGluZ0NvbnRleHRDdXJzb3JQb3NpdGlvbjsKICAgICAgICAgfSBlbHNlIHsKLSAgICAg ICAgICAgIHBvc3RMYXlvdXREYXRhLnN1cnJvdW5kaW5nQ29udGV4dCA9IHBsYWluVGV4dCgqc3Vy cm91bmRpbmdSYW5nZSk7CisgICAgICAgICAgICBpZiAoc3Vycm91bmRpbmdSYW5nZSkKKyAgICAg ICAgICAgICAgICBwb3N0TGF5b3V0RGF0YS5zdXJyb3VuZGluZ0NvbnRleHQgPSBwbGFpblRleHQo KnN1cnJvdW5kaW5nUmFuZ2UpOwogICAgICAgICAgICAgaWYgKHN1cnJvdW5kaW5nU3RhcnQuaXNO dWxsKCkgfHwgc2VsZWN0aW9uU3RhcnQuaXNOdWxsKCkpCiAgICAgICAgICAgICAgICAgcG9zdExh eW91dERhdGEuc3Vycm91bmRpbmdDb250ZXh0Q3Vyc29yUG9zaXRpb24gPSAwOwogICAgICAgICAg ICAgZWxzZQo= 395383 2020-04-03 09:17:05 -0700 2020-04-03 09:54:18 -0700 Patch bug-209966-20200403181704.patch text/plain 1730 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NDU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDE1OTI0YmRiNmRiNzU3ZGIx MmZmMjc2MjBhMDlhZThjZmQ1MjQ4ZjEuLjRmZDQ5MTk5Y2QyM2UxOTIxOWQ2NTlhNTJkOWM2YjFj NGFjMzUyNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDQtMDMgIERpZWdvIFBp bm8gR2FyY2lhICA8ZHBpbm9AaWdhbGlhLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OKHIyNTk0 MDEpOiBbR1RLXSBDaGVjayBzdXJyb3VuZGluZ1JhbmdlIGlzIG5vdCBudWxsCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk5NjYKKworICAgICAgICBS ZXZpZXdlZCBieSBEYXJpbiBBZGxlciAmIFBoaWxpcHBlIE5vcm1hbmQuCisKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvZ2xpYi9XZWJQYWdlR0xpYi5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2U6OmdldFBsYXRmb3JtRWRpdG9yU3RhdGUgY29uc3QpOgorCiAyMDIwLTA0LTAzICBB ZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5y ZXZpZXdlZCBmaXggYWZ0ZXIgcjI1OTM4MgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvZ2xpYi9XZWJQYWdlR0xpYi5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9nbGliL1dlYlBhZ2VHTGliLmNwcAppbmRleCAxNmI1MzhjZjk5YjQ1MWMy NTVhODQxMGU2ZmM5YmQ2YjgzNjY0YzMxLi5lM2JiMzRjYzdhYzNkZGNlNmExMmFkZjg3NTMxMjUz NzZkNjYzZGVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9n bGliL1dlYlBhZ2VHTGliLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9nbGliL1dlYlBhZ2VHTGliLmNwcApAQCAtMTE3LDcgKzExNyw3IEBAIHZvaWQgV2ViUGFnZTo6 Z2V0UGxhdGZvcm1FZGl0b3JTdGF0ZShGcmFtZSYgZnJhbWUsIEVkaXRvclN0YXRlJiByZXN1bHQp IGNvbnN0CiAgICAgICAgICAgICBwb3N0TGF5b3V0RGF0YS5zdXJyb3VuZGluZ0NvbnRleHRDdXJz b3JQb3NpdGlvbiA9IGNoYXJhY3RlckNvdW50KCpzdXJyb3VuZGluZ1JhbmdlKTsKICAgICAgICAg ICAgIHBvc3RMYXlvdXREYXRhLnN1cnJvdW5kaW5nQ29udGV4dFNlbGVjdGlvblBvc2l0aW9uID0g cG9zdExheW91dERhdGEuc3Vycm91bmRpbmdDb250ZXh0Q3Vyc29yUG9zaXRpb247CiAgICAgICAg IH0gZWxzZSB7Ci0gICAgICAgICAgICBwb3N0TGF5b3V0RGF0YS5zdXJyb3VuZGluZ0NvbnRleHQg PSBwbGFpblRleHQoKnN1cnJvdW5kaW5nUmFuZ2UpOworICAgICAgICAgICAgcG9zdExheW91dERh dGEuc3Vycm91bmRpbmdDb250ZXh0ID0gc3Vycm91bmRpbmdSYW5nZSA/IHBsYWluVGV4dCgqc3Vy cm91bmRpbmdSYW5nZSkgOiBlbXB0eVN0cmluZygpOwogICAgICAgICAgICAgaWYgKHN1cnJvdW5k aW5nU3RhcnQuaXNOdWxsKCkgfHwgc2VsZWN0aW9uU3RhcnQuaXNOdWxsKCkpCiAgICAgICAgICAg ICAgICAgcG9zdExheW91dERhdGEuc3Vycm91bmRpbmdDb250ZXh0Q3Vyc29yUG9zaXRpb24gPSAw OwogICAgICAgICAgICAgZWxzZQo=