213524 2020-06-23 10:49:42 -0700 Handle string overflow in DFG graph dump while validating AI. 2020-06-23 11:49:53 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam benjamin cdumez cmarcelo darin ews-watchlist keith_miller msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1665445 0 mark.lam 2020-06-23 10:49:42 -0700 <rdar://problem/64635620> 1665447 1 402569 mark.lam 2020-06-23 10:56:49 -0700 Created attachment 402569 proposed patch. 1665458 2 mark.lam 2020-06-23 11:16:26 -0700 Thanks for the review. Landed in r263405: <http://trac.webkit.org/r263405>. 1665461 3 402569 darin 2020-06-23 11:22:41 -0700 Comment on attachment 402569 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=402569&action=review > Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp:563 > + auto expectedString = out.tryToString(); > + m_graphDump = expectedString ? expectedString.value() : String("<out of memory while dumping graph>"_s); I would have written this using valueOr. I think it possibly be this one-liner: m_graphDump = out.tryToString().valueOr("<out of memory while dumping graph>"_s); 1665468 4 mark.lam 2020-06-23 11:44:07 -0700 (In reply to Darin Adler from comment #3) > Comment on attachment 402569 [details] > proposed patch. > > View in context: > https://bugs.webkit.org/attachment.cgi?id=402569&action=review > > > Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp:563 > > + auto expectedString = out.tryToString(); > > + m_graphDump = expectedString ? expectedString.value() : String("<out of memory while dumping graph>"_s); > > I would have written this using valueOr. I think it possibly be this > one-liner: > > m_graphDump = out.tryToString().valueOr("<out of memory while dumping > graph>"_s); Nice. Will apply this (except with Expected::value_or(); there's no valueOr() method). 1665477 5 mark.lam 2020-06-23 11:49:53 -0700 Landed follow up in r263408: <http://trac.webkit.org/r263408>. 402569 2020-06-23 10:56:49 -0700 2020-06-23 10:59:26 -0700 proposed patch. bug-213524.patch text/plain 4479 mark.lam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNjM0MDMpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEzIEBACisyMDIwLTA2LTIzICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNv bT4KKworICAgICAgICBIYW5kbGUgc3RyaW5nIG92ZXJmbG93IGluIERGRyBncmFwaCBkdW1wIHdo aWxlIHZhbGlkYXRpbmcgQUkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTM1MjQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY0NjM1NjIwPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3RyZXNzL3N0 cmluZy1vdmVyZmxvdy1pbi1kZmctZ3JhcGgtZHVtcC5qczogQWRkZWQuCisKIDIwMjAtMDYtMjEg IE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0Bnbm9tZS5vcmc+CiAKICAgICAgICAgQXR0 ZW1wdCB0byB1bnNraXAgc3RyZXNzIHRlc3QgYXJyYXktYnVmZmVyLXZpZXctd2F0Y2hwb2ludC1j YW4tYmUtZmlyZWQtcmVhbGx5LWFkZC1pbi1kZmcuanMgb24gbW9zdCBhcmNoaXRlY3R1cmVzCklu ZGV4OiBKU1Rlc3RzL3N0cmVzcy9zdHJpbmctb3ZlcmZsb3ctaW4tZGZnLWdyYXBoLWR1bXAuanMK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gSlNUZXN0cy9zdHJlc3Mvc3RyaW5nLW92ZXJmbG93LWluLWRmZy1ncmFw aC1kdW1wLmpzCShub25leGlzdGVudCkKKysrIEpTVGVzdHMvc3RyZXNzL3N0cmluZy1vdmVyZmxv dy1pbi1kZmctZ3JhcGgtZHVtcC5qcwkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDEwIEBACisv L0Agc2tpcCBpZiAkbWVtb3J5TGltaXRlZAorLy9AIHJ1bkRlZmF1bHQoIi0tdmFsaWRhdGVBYnN0 cmFjdEludGVycHJldGVyU3RhdGU9MSIsICItLWppdFBvbGljeVNjYWxlPTAiLCAiLS11c2VDb25j dXJyZW50SklUPTAiKQorCitjb25zdCBzID0gJ0EnLnJlcGVhdCgyKioyNSAqIDUpOworY29uc3Qg byA9IHt9OworZm9yIChsZXQgaSA9IDA7IGkgPCAxOyBpKyspIHsKKyAgICBvW3NdOworICAgIGZv ciAobGV0IGogPSAwOyBqIDwgMTA7IGorKykgeworICAgIH0KK30KSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L0NoYW5nZUxvZwkocmV2aXNpb24gMjYzNDAzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDIwLTA2LTIzICBNYXJr IExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBIYW5kbGUgc3RyaW5nIG92ZXJm bG93IGluIERGRyBncmFwaCBkdW1wIHdoaWxlIHZhbGlkYXRpbmcgQUkuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM1MjQKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzY0NjM1NjIwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogZnRsL0ZUTExvd2VyREZHVG9CMy5jcHA6CisgICAgICAgIChKU0M6OkZU TDo6REZHOjpMb3dlckRGR1RvQjM6OnZhbGlkYXRlQUlTdGF0ZSk6CisKIDIwMjAtMDYtMjMgIERl dmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIEtleWZyYW1lIGFuaW1h dGlvbiBkb2Vzbid0ICd0IHNob3cgdXAgaW4gdGhlIEFuaW1hdGlvbnMgdGltZWxpbmUKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAJKHJldmlz aW9uIDI2MzQwMykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0Iz LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTU5LDcgKzU1OSw4IEBAIHByaXZhdGU6CiAgICAgICAg IGlmICghbV9ncmFwaER1bXApIHsKICAgICAgICAgICAgIFN0cmluZ1ByaW50U3RyZWFtIG91dDsK ICAgICAgICAgICAgIG1fZ3JhcGguZHVtcChvdXQpOwotICAgICAgICAgICAgbV9ncmFwaER1bXAg PSBvdXQudG9TdHJpbmcoKTsKKyAgICAgICAgICAgIGF1dG8gZXhwZWN0ZWRTdHJpbmcgPSBvdXQu dHJ5VG9TdHJpbmcoKTsKKyAgICAgICAgICAgIG1fZ3JhcGhEdW1wID0gZXhwZWN0ZWRTdHJpbmcg PyBleHBlY3RlZFN0cmluZy52YWx1ZSgpIDogU3RyaW5nKCI8b3V0IG9mIG1lbW9yeSB3aGlsZSBk dW1waW5nIGdyYXBoPiJfcyk7CiAgICAgICAgIH0KIAogICAgICAgICBzd2l0Y2ggKG5vZGUtPm9w KCkpIHsKSW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X VEYvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjM0MDMpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwko d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIwLTA2LTIzICBNYXJrIExhbSAgPG1h cmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBIYW5kbGUgc3RyaW5nIG92ZXJmbG93IGluIERG RyBncmFwaCBkdW1wIHdoaWxlIHZhbGlkYXRpbmcgQUkuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM1MjQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzY0NjM1NjIwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogd3RmL1N0cmluZ1ByaW50U3RyZWFtLmNwcDoKKyAgICAgICAgKFdURjo6U3RyaW5nUHJp bnRTdHJlYW06OnRyeVRvU3RyaW5nKToKKyAgICAgICAgKiB3dGYvU3RyaW5nUHJpbnRTdHJlYW0u aDoKKwogMjAyMC0wNi0yMiAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KIAogICAg ICAgICBBbGxvdyBidWlsZGluZyBKYXZhU2NyaXB0Q29yZSBNYWMrYXJtNjQgaW4gcHVibGljIFNE SyBidWlsZApJbmRleDogU291cmNlL1dURi93dGYvU3RyaW5nUHJpbnRTdHJlYW0uY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL1N0cmluZ1ByaW50U3RyZWFtLmNwcAkocmV2aXNpb24g MjYzNDAzKQorKysgU291cmNlL1dURi93dGYvU3RyaW5nUHJpbnRTdHJlYW0uY3BwCSh3b3JraW5n IGNvcHkpCkBAIC05NSw2ICs5NSwxNCBAQCB2b2lkIFN0cmluZ1ByaW50U3RyZWFtOjpyZXNldCgp CiAgICAgbV9idWZmZXJbMF0gPSAwOwogfQogCitFeHBlY3RlZDxTdHJpbmcsIFVURjhDb252ZXJz aW9uRXJyb3I+IFN0cmluZ1ByaW50U3RyZWFtOjp0cnlUb1N0cmluZygpCit7CisgICAgQVNTRVJU KG1fbmV4dCA9PSBzdHJsZW4obV9idWZmZXIpKTsKKyAgICBpZiAobV9uZXh0ID4gU3RyaW5nOjpN YXhMZW5ndGgpCisgICAgICAgIHJldHVybiBtYWtlVW5leHBlY3RlZChVVEY4Q29udmVyc2lvbkVy cm9yOjpPdXRPZk1lbW9yeSk7CisgICAgcmV0dXJuIFN0cmluZzo6ZnJvbVVURjgobV9idWZmZXIs IG1fbmV4dCk7Cit9CisKIFN0cmluZyBTdHJpbmdQcmludFN0cmVhbTo6dG9TdHJpbmcoKQogewog ICAgIEFTU0VSVChtX25leHQgPT0gc3RybGVuKG1fYnVmZmVyKSk7CkluZGV4OiBTb3VyY2UvV1RG L3d0Zi9TdHJpbmdQcmludFN0cmVhbS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL1N0 cmluZ1ByaW50U3RyZWFtLmgJKHJldmlzaW9uIDI2MzQwMykKKysrIFNvdXJjZS9XVEYvd3RmL1N0 cmluZ1ByaW50U3RyZWFtLmgJKHdvcmtpbmcgY29weSkKQEAgLTQxLDYgKzQxLDcgQEAgcHVibGlj OgogICAgIHNpemVfdCBsZW5ndGgoKSBjb25zdCB7IHJldHVybiBtX25leHQ7IH0KICAgICAKICAg ICBXVEZfRVhQT1JUX1BSSVZBVEUgQ1N0cmluZyB0b0NTdHJpbmcoKTsKKyAgICBXVEZfRVhQT1JU X1BSSVZBVEUgRXhwZWN0ZWQ8U3RyaW5nLCBVVEY4Q29udmVyc2lvbkVycm9yPiB0cnlUb1N0cmlu ZygpOwogICAgIFdURl9FWFBPUlRfUFJJVkFURSBTdHJpbmcgdG9TdHJpbmcoKTsKICAgICBXVEZf RVhQT1JUX1BSSVZBVEUgU3RyaW5nIHRvU3RyaW5nV2l0aExhdGluMUZhbGxiYWNrKCk7CiAgICAg V1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgcmVzZXQoKTsK