@joebigelow / wix / commits / 00c2987a

Require \r\n in ConsoleReadW

Sean Hall committed Jun 24, 2022 at 12:25 UTC 00c2987aabe6a003b1345ebe1ff3a4bd58d8222e
1 file changed +1 -1
src/libs/dutil/WixToolset.DUtil/conutil.cpp
+1 -1
@@ -353,7 +353,7 @@ extern "C" HRESULT DAPI ConsoleReadW(
353 ConExitOnLastError(hr, "failed to read string from console");
354
355 cchTotalRead += cchRead;
356 - if (1 < cchTotalRead && '\r' == psz[cchTotalRead - 2] || '\n' == psz[cchTotalRead - 1])
356 + if (1 < cchTotalRead && '\r' == psz[cchTotalRead - 2] && '\n' == psz[cchTotalRead - 1])
357 {
358 psz[cchTotalRead - 2] = '\0'; // chop off the \r\n
359 break;