181608 2018-01-12 12:07:14 -0800 Logged JSON should escape "'s and \'s in strings. 2018-01-12 13:40:34 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 krollin krollin bfulgham cdumez commit-queue dbates ews-watchlist japhet webkit-bug-importer oldest_to_newest 1388896 0 krollin 2018-01-12 12:07:14 -0800 The logging in bug 181556 and bug 180883 should properly escape strings printed as part of JSON-formatted output. 1388906 1 331225 krollin 2018-01-12 12:23:34 -0800 Created attachment 331225 Patch 1388907 2 ews-watchlist 2018-01-12 12:26:22 -0800 Attachment 331225 did not pass style-queue: ERROR: Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:748: Missing space before { [whitespace/braces] [5] ERROR: Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:749: Missing space before { [whitespace/braces] [5] ERROR: Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:750: Missing space before { [whitespace/braces] [5] ERROR: Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:767: Missing space before { [whitespace/braces] [5] ERROR: Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:768: Missing space before { [whitespace/braces] [5] ERROR: Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:769: Missing space before { [whitespace/braces] [5] ERROR: Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:770: Missing space before { [whitespace/braces] [5] ERROR: Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:776: Missing space before { [whitespace/braces] [5] ERROR: Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:777: Missing space before { [whitespace/braces] [5] ERROR: Source/WebCore/loader/ResourceLoadObserver.cpp:316: Missing space before { [whitespace/braces] [5] ERROR: Source/WebCore/loader/ResourceLoadObserver.cpp:317: Missing space before { [whitespace/braces] [5] Total errors found: 11 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1388913 3 331225 bfulgham 2018-01-12 12:43:37 -0800 Comment on attachment 331225 Patch r=me 1388944 4 331225 commit-queue 2018-01-12 13:39:05 -0800 Comment on attachment 331225 Patch Clearing flags on attachment: 331225 Committed r226913: <https://trac.webkit.org/changeset/226913> 1388945 5 commit-queue 2018-01-12 13:39:06 -0800 All reviewed patches have been landed. Closing bug. 1388947 6 webkit-bug-importer 2018-01-12 13:40:34 -0800 <rdar://problem/36481015> 331225 2018-01-12 12:23:34 -0800 2018-01-12 13:39:05 -0800 Patch bug-181608-20180112122333.patch text/plain 6493 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2NzIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWRkNmMxN2NmNzg0N2Yw MDhkZWU3ZDllYTE4MzdmMDBlYjEzYWY3OS4uMTg0NzkzYTFlMGU4Y2NiMGQ3YzE0NTUwNjQ0MmE0 Njc2MjgzYTU3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE4LTAxLTEyICBLZWl0 aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KKworICAgICAgICBMb2dnZWQgSlNPTiBzaG91 bGQgZXNjYXBlICIncyBhbmQgXCdzIGluIHN0cmluZ3MuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODE2MDgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgLS0gbm8gbmV3IGZ1bmN0aW9u YWxpdHksIGp1c3QgY2hhbmdlZCBsb2dnaW5nLiBUaGUKKyAgICAgICAgZWZmaWNhY3kgb2YgdGhl IGxvZ2dpbmcgd2FzIHZlcmlmaWVkIGJ5IGluc3BlY3RpbmcgaXRzIG91dHB1dC4KKworICAgICAg ICAqIGxvYWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZXNvdXJjZUxvYWRPYnNlcnZlcjo6bG9nVXNlckludGVyYWN0aW9uV2l0aFJlZHVjZWRUaW1lUmVz b2x1dGlvbik6CisKIDIwMTgtMDEtMTEgIEtlaXRoIFJvbGxpbiAgPGtyb2xsaW5AYXBwbGUuY29t PgogCiAgICAgICAgIEFkZCBvcHRpb25hbCBsb2dnaW5nIG9mIElUUC1yZWxhdGVkIHVzZXIgaW50 ZXJhY3Rpb24gaW5mb3JtYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n IGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggYzM0YzIxYTc3MDE5ZmU5MDQ1ZDVmMDFj Mzk1ZmY3ODQzZWRjMjBhMS4uOGJhNWUwMzBlYjY0OTUxMGIzOTczYjdjNjNlMjJkNzFhMjdiNzVm NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxOC0wMS0xMiAgS2VpdGggUm9sbGluICA8 a3JvbGxpbkBhcHBsZS5jb20+CisKKyAgICAgICAgTG9nZ2VkIEpTT04gc2hvdWxkIGVzY2FwZSAi J3MgYW5kIFwncyBpbiBzdHJpbmdzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTgxNjA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3Bw OgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmxvZ0Nvb2tpZUluZm9y bWF0aW9uIGNvbnN0KToKKwogMjAxOC0wMS0xMSAgS2VpdGggUm9sbGluICA8a3JvbGxpbkBhcHBs ZS5jb20+CiAKICAgICAgICAgQWRkIG9wdGlvbmFsIGxvZ2dpbmcgb2YgSVRQLXJlbGF0ZWQgdXNl ciBpbnRlcmFjdGlvbiBpbmZvcm1hdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNv dXJjZUxvYWRPYnNlcnZlci5jcHAKaW5kZXggZDc5ZTIxOGJkNmQwYjNjNjZlNDdhODI0NjIxMGQz OTU5YWIzMjc2My4uYzQzZTBmYTdmMTg2NTYwMzBhZjNhNjU4Y2QyMGI5NzZhMmU2Yjg5ZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2ZXIuY3BwCkBAIC0z MDYsOCArMzA2LDE1IEBAIHZvaWQgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1VzZXJJbnRlcmFj dGlvbldpdGhSZWR1Y2VkVGltZVJlc29sdXRpb24oY29uc3QgRG9jCiAjZGVmaW5lIExPQ0FMX0xP RyhzdHIsIC4uLikgXAogICAgICAgICBSRUxFQVNFX0xPRyhSZXNvdXJjZUxvYWRTdGF0aXN0aWNz LCAiUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1VzZXJJbnRlcmFjdGlvbjogY291bnRlciA9ICUi IFBSSXU2NCAiOiAiIHN0ciwgY291bnRlciwgIyNfX1ZBX0FSR1NfXykKIAotICAgICAgICBMT0NB TF9MT0coUiIoeyAidXJsIjogIiV7cHVibGljfXMiLCkiLCB1cmwuc3RyaW5nKCkudXRmOCgpLmRh dGEoKSk7Ci0gICAgICAgIExPQ0FMX0xPRyhSIiggICJkb21haW4iIDogIiV7cHVibGljfXMiLCki LCBkb21haW4udXRmOCgpLmRhdGEoKSk7CisgICAgICAgIGF1dG8gZXNjYXBlRm9ySlNPTiA9IFtd KFN0cmluZyBzKSB7CisgICAgICAgICAgICBzLnJlcGxhY2UoJ1xcJywgIlxcXFwiKS5yZXBsYWNl KCciJywgIlxcXCIiKTsKKyAgICAgICAgICAgIHJldHVybiBzOworICAgICAgICB9OworICAgICAg ICBhdXRvIGVzY2FwZWRVUkwgPSBlc2NhcGVGb3JKU09OKHVybC5zdHJpbmcoKSk7CisgICAgICAg IGF1dG8gZXNjYXBlZERvbWFpbiA9IGVzY2FwZUZvckpTT04oZG9tYWluKTsKKworICAgICAgICBM T0NBTF9MT0coUiIoeyAidXJsIjogIiV7cHVibGljfXMiLCkiLCBlc2NhcGVkVVJMLnV0ZjgoKS5k YXRhKCkpOworICAgICAgICBMT0NBTF9MT0coUiIoICAiZG9tYWluIiA6ICIle3B1YmxpY31zIiwp IiwgZXNjYXBlZERvbWFpbi51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgTE9DQUxfTE9HKFIiKCAg InVudGlsIiA6ICVmIH0pIiwgbmV3VGltZS5zZWNvbmRzU2luY2VFcG9jaCgpLnNlY29uZHMoKSk7 CiAKICN1bmRlZiBMT0NBTF9MT0cKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcAppbmRleCAyNGU1OGI4M2I1MTcyMDQ1ODc4 MzA2NGNkNzNlZmU5MTViOTU1OWVhLi4zNGRiMTQ3ZjFjMDE0MDI2ZTc4YjYzYjg0MGQ3MDk4YTIw YmM4ZmM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtS ZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC03MzcsOSArNzM3LDE3IEBAIHZvaWQgTmV0d29ya1Jl c291cmNlTG9hZGVyOjpsb2dDb29raWVJbmZvcm1hdGlvbigpIGNvbnN0CiAjZGVmaW5lIExPQ0FM X0xPRyhzdHIsIC4uLikgXAogICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJsb2dDb29r aWVJbmZvcm1hdGlvbjogcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQg IiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiOiAiIHN0ciwgcGFnZUlEKCksIGZyYW1lSUQoKSwg aWRlbnRpZmllcigpLCAjI19fVkFfQVJHU19fKQogCi0gICAgICAgIExPQ0FMX0xPRyhSIih7ICJ1 cmwiOiAiJXtwdWJsaWN9cyIsKSIsIHVybC5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKLSAgICAg ICAgTE9DQUxfTE9HKFIiKCAgInBhcnRpdGlvbiI6ICIle3B1YmxpY31zIiwpIiwgcGFydGl0aW9u LnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwotICAgICAgICBMT0NBTF9MT0coUiIoICAicmVmZXJl ciI6ICIle3B1YmxpY31zIiwpIiwgb3JpZ2luYWxSZXF1ZXN0KCkuaHR0cFJlZmVycmVyKCkudXRm OCgpLmRhdGEoKSk7CisgICAgICAgIGF1dG8gZXNjYXBlRm9ySlNPTiA9IFtdKFN0cmluZyBzKSB7 CisgICAgICAgICAgICBzLnJlcGxhY2UoJ1xcJywgIlxcXFwiKS5yZXBsYWNlKCciJywgIlxcXCIi KTsKKyAgICAgICAgICAgIHJldHVybiBzOworICAgICAgICB9OworICAgICAgICBhdXRvIGVzY2Fw ZWRVUkwgPSBlc2NhcGVGb3JKU09OKHVybC5zdHJpbmcoKSk7CisgICAgICAgIGF1dG8gZXNjYXBl ZFBhcnRpdGlvbiA9IGVzY2FwZUZvckpTT04ocGFydGl0aW9uLnN0cmluZygpKTsKKyAgICAgICAg YXV0byBlc2NhcGVkUmVmZXJyZXIgPSBlc2NhcGVGb3JKU09OKG9yaWdpbmFsUmVxdWVzdCgpLmh0 dHBSZWZlcnJlcigpKTsKKworICAgICAgICBMT0NBTF9MT0coUiIoeyAidXJsIjogIiV7cHVibGlj fXMiLCkiLCBlc2NhcGVkVVJMLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICBMT0NBTF9MT0coUiIo ICAicGFydGl0aW9uIjogIiV7cHVibGljfXMiLCkiLCBlc2NhcGVkUGFydGl0aW9uLnV0ZjgoKS5k YXRhKCkpOworICAgICAgICBMT0NBTF9MT0coUiIoICAicmVmZXJlciI6ICIle3B1YmxpY31zIiwp IiwgZXNjYXBlZFJlZmVycmVyLnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICBMT0NBTF9MT0coUiIo ICAiY29va2llcyI6IFspIik7CiAKICAgICAgICAgYXV0byBzaXplID0gY29va2llcy5zaXplKCk7 CkBAIC03NDksMTcgKzc1NywyNCBAQCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6bG9nQ29v a2llSW5mb3JtYXRpb24oKSBjb25zdAogICAgICAgICAgICAgaWYgKCsrY291bnQgPT0gc2l6ZSkK ICAgICAgICAgICAgICAgICB0cmFpbGluZ0NvbW1hID0gIiI7CiAKLSAgICAgICAgICAgIExPQ0FM X0xPRyhSIiggIHsgIm5hbWUiOiAiJXtwdWJsaWN9cyIsKSIsIGNvb2tpZS5uYW1lLnV0ZjgoKS5k YXRhKCkpOwotICAgICAgICAgICAgTE9DQUxfTE9HKFIiKCAgICAidmFsdWUiOiAiJXtwdWJsaWN9 cyIsKSIsIGNvb2tpZS52YWx1ZS51dGY4KCkuZGF0YSgpKTsKLSAgICAgICAgICAgIExPQ0FMX0xP RyhSIiggICAgImRvbWFpbiI6ICIle3B1YmxpY31zIiwpIiwgY29va2llLmRvbWFpbi51dGY4KCku ZGF0YSgpKTsKLSAgICAgICAgICAgIExPQ0FMX0xPRyhSIiggICAgInBhdGgiOiAiJXtwdWJsaWN9 cyIsKSIsIGNvb2tpZS5wYXRoLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICAgICAgYXV0byBlc2Nh cGVkTmFtZSA9IGVzY2FwZUZvckpTT04oY29va2llLm5hbWUpOworICAgICAgICAgICAgYXV0byBl c2NhcGVkVmFsdWUgPSBlc2NhcGVGb3JKU09OKGNvb2tpZS52YWx1ZSk7CisgICAgICAgICAgICBh dXRvIGVzY2FwZWREb21haW4gPSBlc2NhcGVGb3JKU09OKGNvb2tpZS5kb21haW4pOworICAgICAg ICAgICAgYXV0byBlc2NhcGVkUGF0aCA9IGVzY2FwZUZvckpTT04oY29va2llLnBhdGgpOworICAg ICAgICAgICAgYXV0byBlc2NhcGVkQ29tbWVudCA9IGVzY2FwZUZvckpTT04oY29va2llLmNvbW1l bnQpOworICAgICAgICAgICAgYXV0byBlc2NhcGVkQ29tbWVudFVSTCA9IGVzY2FwZUZvckpTT04o Y29va2llLmNvbW1lbnRVUkwuc3RyaW5nKCkpOworCisgICAgICAgICAgICBMT0NBTF9MT0coUiIo ICB7ICJuYW1lIjogIiV7cHVibGljfXMiLCkiLCBlc2NhcGVkTmFtZS51dGY4KCkuZGF0YSgpKTsK KyAgICAgICAgICAgIExPQ0FMX0xPRyhSIiggICAgInZhbHVlIjogIiV7cHVibGljfXMiLCkiLCBl c2NhcGVkVmFsdWUudXRmOCgpLmRhdGEoKSk7CisgICAgICAgICAgICBMT0NBTF9MT0coUiIoICAg ICJkb21haW4iOiAiJXtwdWJsaWN9cyIsKSIsIGVzY2FwZWREb21haW4udXRmOCgpLmRhdGEoKSk7 CisgICAgICAgICAgICBMT0NBTF9MT0coUiIoICAgICJwYXRoIjogIiV7cHVibGljfXMiLCkiLCBl c2NhcGVkUGF0aC51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgICAgIExPQ0FMX0xPRyhSIiggICAg ImNyZWF0ZWQiOiAlZiwpIiwgY29va2llLmNyZWF0ZWQpOwogICAgICAgICAgICAgTE9DQUxfTE9H KFIiKCAgICAiZXhwaXJlcyI6ICVmLCkiLCBjb29raWUuZXhwaXJlcyk7CiAgICAgICAgICAgICBM T0NBTF9MT0coUiIoICAgICJodHRwT25seSI6ICV7cHVibGljfXMsKSIsIGNvb2tpZS5odHRwT25s eSA/ICJ0cnVlIiA6ICJmYWxzZSIpOwogICAgICAgICAgICAgTE9DQUxfTE9HKFIiKCAgICAic2Vj dXJlIjogJXtwdWJsaWN9cywpIiwgY29va2llLnNlY3VyZSA/ICJ0cnVlIiA6ICJmYWxzZSIpOwog ICAgICAgICAgICAgTE9DQUxfTE9HKFIiKCAgICAic2Vzc2lvbiI6ICV7cHVibGljfXMsKSIsIGNv b2tpZS5zZXNzaW9uID8gInRydWUiIDogImZhbHNlIik7Ci0gICAgICAgICAgICBMT0NBTF9MT0co UiIoICAgICJjb21tZW50IjogIiV7cHVibGljfXMiLCkiLCBjb29raWUuY29tbWVudC51dGY4KCku ZGF0YSgpKTsKLSAgICAgICAgICAgIExPQ0FMX0xPRyhSIiggICAgImNvbW1lbnRVUkwiOiAiJXtw dWJsaWN9cyIpIiwgY29va2llLmNvbW1lbnRVUkwuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7Cisg ICAgICAgICAgICBMT0NBTF9MT0coUiIoICAgICJjb21tZW50IjogIiV7cHVibGljfXMiLCkiLCBl c2NhcGVkQ29tbWVudC51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgICAgIExPQ0FMX0xPRyhSIigg ICAgImNvbW1lbnRVUkwiOiAiJXtwdWJsaWN9cyIpIiwgZXNjYXBlZENvbW1lbnRVUkwudXRmOCgp LmRhdGEoKSk7CiAgICAgICAgICAgICBMT0NBTF9MT0coUiIoICB9JXtwdWJsaWN9cykiLCB0cmFp bGluZ0NvbW1hKTsKICAgICAgICAgfQogICAgICAgICBMT0NBTF9MT0coUiIoXX0pIik7Cg==