diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-06-24 12:25:39 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-06-27 11:14:21 -0500 |
| commit | 00c2987aabe6a003b1345ebe1ff3a4bd58d8222e (patch) | |
| tree | 1d52597d102a5377941f6b488ab09142aeb4db25 /src/libs | |
| parent | a6dcebc29a97b9a0e20ff78c138f3afc88ae7b0c (diff) | |
| download | wix-00c2987aabe6a003b1345ebe1ff3a4bd58d8222e.tar.gz wix-00c2987aabe6a003b1345ebe1ff3a4bd58d8222e.tar.bz2 wix-00c2987aabe6a003b1345ebe1ff3a4bd58d8222e.zip | |
Require \r\n in ConsoleReadW
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/dutil/WixToolset.DUtil/conutil.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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( | |||
| 353 | ConExitOnLastError(hr, "failed to read string from console"); | 353 | ConExitOnLastError(hr, "failed to read string from console"); |
| 354 | 354 | ||
| 355 | cchTotalRead += cchRead; | 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 | { | 357 | { |
| 358 | psz[cchTotalRead - 2] = '\0'; // chop off the \r\n | 358 | psz[cchTotalRead - 2] = '\0'; // chop off the \r\n |
| 359 | break; | 359 | break; |