From 00c2987aabe6a003b1345ebe1ff3a4bd58d8222e Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 24 Jun 2022 12:25:39 -0500 Subject: Require \r\n in ConsoleReadW --- src/libs/dutil/WixToolset.DUtil/conutil.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libs') diff --git a/src/libs/dutil/WixToolset.DUtil/conutil.cpp b/src/libs/dutil/WixToolset.DUtil/conutil.cpp index 33e1b59a..7ca17439 100644 --- a/src/libs/dutil/WixToolset.DUtil/conutil.cpp +++ b/src/libs/dutil/WixToolset.DUtil/conutil.cpp @@ -353,7 +353,7 @@ extern "C" HRESULT DAPI ConsoleReadW( ConExitOnLastError(hr, "failed to read string from console"); cchTotalRead += cchRead; - if (1 < cchTotalRead && '\r' == psz[cchTotalRead - 2] || '\n' == psz[cchTotalRead - 1]) + if (1 < cchTotalRead && '\r' == psz[cchTotalRead - 2] && '\n' == psz[cchTotalRead - 1]) { psz[cchTotalRead - 2] = '\0'; // chop off the \r\n break; -- cgit v1.2.3-55-g6feb