src: fix console debug output on Windows

The FWrite function on Windows assumed that MultiByteToWideChar automatically null-terminates the resulting string, but it will only do so if the size of the source was passed as -1 or null character was explicitly counted in the size. The FWrite uses std::string and its `.size()` method which doesn't count the null character even though the `.data()` method adds it to the resulting string. https://docs.microsoft.com/en-us/windows/win32/api/stringapiset/nf-stringapiset-multibytetowidechar#remarks > MultiByteToWideChar does not null-terminate an output string if the input string length is explicitly specified without a terminating null character. To null-terminate an output string for this function, the application should pass in -1 or explicitly count the terminating null character for the input string. PR-URL: #31580 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Rich Trott <[email protected]>

Author: lundibundi

src/debug_utils.cc

@@ -468,9 +468,7 @@ void FWrite(FILE* file, const std::string& str){
  std::vector<wchar_t> wbuf(n);
 MultiByteToWideChar(CP_UTF8, 0, str.data(), str.size(), wbuf.data(), n);
 
-// Don't include the final null character in the output
-CHECK_GT(n, 0);
-WriteConsoleW(handle, wbuf.data(), n - 1, nullptr, nullptr);
+WriteConsoleW(handle, wbuf.data(), n, nullptr, nullptr);
 return;
 #elif defined(__ANDROID__)
 if (file == stderr){

test/parallel/test-http2-debug.js

@@ -12,16 +12,16 @@ const{stdout, stderr } = child_process.spawnSync(process.execPath, [
 path.resolve(__dirname,'test-http2-ping.js')
 ],{encoding: 'utf8'});
 
-assert(stderr.match(/SettingtheNODE_DEBUGenvironmentvariableto'http2'canexposesensitivedata\(suchaspasswords,tokensandauthenticationheaders\)intheresultinglog\./),
+assert(stderr.match(/SettingtheNODE_DEBUGenvironmentvariableto'http2'canexposesensitivedata\(suchaspasswords,tokensandauthenticationheaders\)intheresultinglog\.\r?\n/),
 stderr);
-assert(stderr.match(/Http2Sessionclient\(\d+\)handlingdataframeforstream\d+/),
+assert(stderr.match(/Http2Sessionclient\(\d+\)handlingdataframeforstream\d+\r?\n/),
 stderr);
-assert(stderr.match(/HttpStream\d+\(\d+\)\[Http2Sessionclient\(\d+\)\]readingstarting/),
+assert(stderr.match(/HttpStream\d+\(\d+\)\[Http2Sessionclient\(\d+\)\]readingstarting\r?\n/),
 stderr);
-assert(stderr.match(/HttpStream\d+\(\d+\)\[Http2Sessionclient\(\d+\)\]closedwithcode0/),
+assert(stderr.match(/HttpStream\d+\(\d+\)\[Http2Sessionclient\(\d+\)\]closedwithcode0\r?\n/),
 stderr);
-assert(stderr.match(/HttpStream\d+\(\d+\)\[Http2Sessionserver\(\d+\)\]closedwithcode0/),
+assert(stderr.match(/HttpStream\d+\(\d+\)\[Http2Sessionserver\(\d+\)\]closedwithcode0\r?\n/),
 stderr);
-assert(stderr.match(/HttpStream\d+\(\d+\)\[Http2Sessionserver\(\d+\)\]tearingdownstream/),
+assert(stderr.match(/HttpStream\d+\(\d+\)\[Http2Sessionserver\(\d+\)\]tearingdownstream\r?\n/),
 stderr);
 assert.strictEqual(stdout.trim(),'');