169495 2017-03-10 17:13:12 -0800 Allow regular expressions to be used when selecting a process name in JSC config file 2017-03-11 22:27:52 -0800 1 1 1 Unclassified WebKit JavaScriptCore Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 msaboff msaboff commit-queue keith_miller mark.lam saam oldest_to_newest 1285999 0 msaboff 2017-03-10 17:13:12 -0800 Currently process names filters need to match exactly. It would be better to allow for regular expression matching. 1286000 1 msaboff 2017-03-10 17:13:30 -0800 <rdar://problem/30986750> 1286005 2 304104 msaboff 2017-03-10 17:16:01 -0800 Created attachment 304104 Patch 1286009 3 304104 saam 2017-03-10 17:29:21 -0800 Comment on attachment 304104 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=304104&action=review LGTM > Source/JavaScriptCore/runtime/ConfigFile.cpp:148 > + char* stringStart = ++m_srcPtr; Should you `--m_srcPtr` if the below returns nullptr? Or perhaps, just do, stringStart = m_srcPtr + 1, and then modify m_srcPtr on success? 1286887 4 304104 msaboff 2017-03-11 22:16:24 -0800 Comment on attachment 304104 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=304104&action=review >> Source/JavaScriptCore/runtime/ConfigFile.cpp:148 >> + char* stringStart = ++m_srcPtr; > > Should you `--m_srcPtr` if the below returns nullptr? > Or perhaps, just do, stringStart = m_srcPtr + 1, and then modify m_srcPtr on success? Good catch. I'll address with "stringStart = m_srcPtr + 1" before landing. 1286891 5 msaboff 2017-03-11 22:27:52 -0800 Committed r213768: <http://trac.webkit.org/changeset/213768> 304104 2017-03-10 17:16:01 -0800 2017-03-10 17:29:21 -0800 Patch 169495.patch text/plain 3262 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjEzNzQxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBA CisyMDE3LTAzLTEwICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIEFsbG93IHJlZ3VsYXIgZXhwcmVzc2lvbnMgdG8gYmUgdXNlZCB3aGVuIHNlbGVjdGluZyBh IHByb2Nlc3MgbmFtZSBpbiBKU0MgY29uZmlnIGZpbGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2OTQ5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE9ubHkgYWRkZWQgcmVndWxhciBleHByZXNzaW9uIHNl bGVjdG9ycyBmb3IgdW5peCBsaWtlIHBsYXRmb3Jtcy4KKworICAgICAgICAqIHJ1bnRpbWUvQ29u ZmlnRmlsZS5jcHA6CisgICAgICAgIChKU0M6OkNvbmZpZ0ZpbGVTY2FubmVyOjp0cnlDb25zdW1l UmVnRXhQYXR0ZXJuKToKKyAgICAgICAgKEpTQzo6Q29uZmlnRmlsZTo6cGFyc2UpOgorCiAyMDE3 LTAzLTEwICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgRml4IENNYWtlIGJ1aWxkLgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvQ29uZmlnRmlsZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvQ29uZmlnRmlsZS5jcHAJKHJldmlzaW9uIDIxMzc0MCkKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0NvbmZpZ0ZpbGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNyw2ICsz Nyw3IEBACiAjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nQnVpbGRlci5oPgogCiAjaWYgT1MoVU5J WCkgfHwgT1MoREFSV0lOKQorI2luY2x1ZGUgPHJlZ2V4Lmg+CiAjaW5jbHVkZSA8dW5pc3RkLmg+ CiAjZW5kaWYKIApAQCAtMTM2LDYgKzEzNywzMiBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBu dWxscHRyOwogICAgIH0KIAorICAgIGNoYXIqIHRyeUNvbnN1bWVSZWdFeFBhdHRlcm4oYm9vbCYg aWdub3JlQ2FzZSkKKyAgICB7CisgICAgICAgIGlmICghZmlsbEJ1ZmZlcklmTmVlZGVkKCkpCisg ICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgICAgICBpZiAoKm1fc3JjUHRyICE9ICcv JykKKyAgICAgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgICAgIGNoYXIqIHN0cmluZ1N0 YXJ0ID0gKyttX3NyY1B0cjsKKworICAgICAgICBjaGFyKiBzdHJpbmdFbmQgPSBzdHJjaHIobV9z cmNQdHIsICcvJyk7CisgICAgICAgIGlmIChzdHJpbmdFbmQpIHsKKyAgICAgICAgICAgICpzdHJp bmdFbmQgPSAnXDAnOworICAgICAgICAgICAgbV9zcmNQdHIgPSBzdHJpbmdFbmQgKyAxOworICAg ICAgICAgICAgaWYgKCptX3NyY1B0ciA9PSAnaScpIHsKKyAgICAgICAgICAgICAgICBpZ25vcmVD YXNlID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICBtX3NyY1B0cisrOworICAgICAgICAgICAgfSBl bHNlCisgICAgICAgICAgICAgICAgaWdub3JlQ2FzZSA9IGZhbHNlOworCisgICAgICAgICAgICBy ZXR1cm4gc3RyaW5nU3RhcnQ7CisgICAgICAgIH0KKworICAgICAgICByZXR1cm4gbnVsbHB0cjsK KyAgICB9CisgICAgCiAgICAgY2hhciogdHJ5Q29uc3VtZVVwdG8oYm9vbCYgZm91bmRDaGFyLCBj aGFyIGMpCiAgICAgewogICAgICAgICBpZiAoIWZpbGxCdWZmZXJJZk5lZWRlZCgpKQpAQCAtMzM5 LDEyICszNjYsMzAgQEAgdm9pZCBDb25maWdGaWxlOjpwYXJzZSgpCiAgICAgfTsKIAogICAgIGF1 dG8gcGFyc2VQcmVkaWNhdGUgPSBbJl0oYm9vbCYgcHJlZGljYXRlTWF0Y2hlcywgY29uc3QgY2hh ciogbWF0Y2hWYWx1ZSkgewotICAgICAgICBjaGFyKiBwcmVkaWNhdGVWYWx1ZSA9IG51bGxwdHI7 Ci0gICAgICAgIGlmIChzY2FubmVyLnRyeUNvbnN1bWUoIj09IikKLSAgICAgICAgICAgICYmIChw cmVkaWNhdGVWYWx1ZSA9IHNjYW5uZXIudHJ5Q29uc3VtZVN0cmluZygpKSAmJiBtYXRjaFZhbHVl KSB7CisgICAgICAgIGlmIChzY2FubmVyLnRyeUNvbnN1bWUoIj09IikpIHsKKyAgICAgICAgICAg IGNoYXIqIHByZWRpY2F0ZVZhbHVlID0gbnVsbHB0cjsKKyAgICAgICAgICAgIGlmICgocHJlZGlj YXRlVmFsdWUgPSBzY2FubmVyLnRyeUNvbnN1bWVTdHJpbmcoKSkgJiYgbWF0Y2hWYWx1ZSkgewog ICAgICAgICAgICAgICAgIHByZWRpY2F0ZU1hdGNoZXMgPSAhc3RyY21wKHByZWRpY2F0ZVZhbHVl LCBtYXRjaFZhbHVlKTsKICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAg IH0KICAgICAgICAgfQorI2lmIE9TKFVOSVgpIHx8IE9TKERBUldJTikKKyAgICAgICAgZWxzZSBp ZiAoc2Nhbm5lci50cnlDb25zdW1lKCI9fiIpKSB7CisgICAgICAgICAgICBjaGFyKiBwcmVkaWNh dGVSZWdFeFN0cmluZyA9IG51bGxwdHI7CisgICAgICAgICAgICBib29sIGlnbm9yZUNhc2UgeyBm YWxzZSB9OworICAgICAgICAgICAgaWYgKChwcmVkaWNhdGVSZWdFeFN0cmluZyA9IHNjYW5uZXIu dHJ5Q29uc3VtZVJlZ0V4UGF0dGVybihpZ25vcmVDYXNlKSkgJiYgbWF0Y2hWYWx1ZSkgeworICAg ICAgICAgICAgICAgIHJlZ2V4X3QgcHJlZGljYXRlUmVnRXg7CisgICAgICAgICAgICAgICAgaW50 IHJlZ2V4RmxhZ3MgPSBSRUdfRVhURU5ERUQ7CisgICAgICAgICAgICAgICAgaWYgKGlnbm9yZUNh c2UpCisgICAgICAgICAgICAgICAgICAgIHJlZ2V4RmxhZ3MgfD0gUkVHX0lDQVNFOworICAgICAg ICAgICAgICAgIGlmIChyZWdjb21wKCZwcmVkaWNhdGVSZWdFeCwgcHJlZGljYXRlUmVnRXhTdHJp bmcsIHJlZ2V4RmxhZ3MpKQorICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAg ICAgICAgICAgICAgICBwcmVkaWNhdGVNYXRjaGVzID0gIXJlZ2V4ZWMoJnByZWRpY2F0ZVJlZ0V4 LCBtYXRjaFZhbHVlLCAwLCBudWxscHRyLCAwKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorI2VuZGlmCiAKICAgICAgICAgcmV0dXJuIGZh bHNlOwogICAgIH07Cg==