src: correct json writer placement in process.report

himself65 · targos · commit 48c369b71570 · 2019-07-20T11:05:19.000+02:00
PR-URL: #28433 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
diff --git a/src/node_report.cc b/src/node_report.cc
@@ -366,7 +366,6 @@ static void PrintJavaScriptStack(JSONWriter* writer,
   int line = ss.find('\n');
   if (line == -1) {
     writer->json_keyvalue("message", ss);
-    writer->json_objectend();
   } else {
     std::string l = ss.substr(0, line);
     writer->json_keyvalue("message", l);
@@ -382,8 +381,8 @@ static void PrintJavaScriptStack(JSONWriter* writer,
       ss = ss.substr(line + 1);
       line = ss.find('\n');
     }
+    writer->json_arrayend();
   }
-  writer->json_arrayend();
   writer->json_objectend();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,6 @@ static void PrintJavaScriptStack(JSONWriter* writer,`
`366`	`366`	`int line = ss.find('\n');`
`367`	`367`	`if (line == -1) {`
`368`	`368`	`writer->json_keyvalue("message", ss);`
`369`		`- writer->json_objectend();`
`370`	`369`	`} else {`
`371`	`370`	`std::string l = ss.substr(0, line);`
`372`	`371`	`writer->json_keyvalue("message", l);`
`@@ -382,8 +381,8 @@ static void PrintJavaScriptStack(JSONWriter* writer,`
`382`	`381`	`ss = ss.substr(line + 1);`
`383`	`382`	`line = ss.find('\n');`
`384`	`383`	`}`
	`384`	`+ writer->json_arrayend();`
`385`	`385`	`}`
`386`		`- writer->json_arrayend();`
`387`	`386`	`writer->json_objectend();`
`388`	`387`	`}`
`389`	`388`