diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-05-04 08:46:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-04 08:46:40 +0200 |
| commit | 2e3b78d10b54db9a0fe054292903e3925368c18d (patch) | |
| tree | 40d7bebf5cf0bcf556289f83cf84df91574d6df2 | |
| parent | 2b3cb2c448f9a7ce6132d2d0423c0d1cf627a0d3 (diff) | |
| parent | b9dba14fa32f49b145d1d415f2e869140a2a6a5c (diff) | |
| download | rneovim-2e3b78d10b54db9a0fe054292903e3925368c18d.tar.gz rneovim-2e3b78d10b54db9a0fe054292903e3925368c18d.tar.bz2 rneovim-2e3b78d10b54db9a0fe054292903e3925368c18d.zip | |
Merge #6670 from jamessan/conversion-overflow
| -rw-r--r-- | ci/build.bat | 8 | ||||
| -rw-r--r-- | src/nvim/mbyte.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ci/build.bat b/ci/build.bat index bc110396ef..c871c6b849 100644 --- a/ci/build.bat +++ b/ci/build.bat @@ -31,14 +31,14 @@ python3 -c "import neovim; print(str(neovim))" || goto :error mkdir .deps cd .deps -cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release ..\third-party\ || goto :error +cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo ..\third-party\ || goto :error mingw32-make VERBOSE=1 || goto :error cd .. :: Build Neovim mkdir build cd build -cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUSTED_OUTPUT_TYPE=nvim -DGPERF_PRG="C:\msys64\usr\bin\gperf.exe" .. || goto :error +cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUSTED_OUTPUT_TYPE=nvim -DGPERF_PRG="C:\msys64\usr\bin\gperf.exe" .. || goto :error mingw32-make VERBOSE=1 || goto :error bin\nvim --version || goto :error @@ -46,8 +46,8 @@ bin\nvim --version || goto :error mingw32-make functionaltest VERBOSE=1 || goto :error :: Build artifacts -cpack -G ZIP -C Release -if defined APPVEYOR_REPO_TAG_NAME cpack -G NSIS -C Release +cpack -G ZIP -C RelWithDebInfo +if defined APPVEYOR_REPO_TAG_NAME cpack -G NSIS -C RelWithDebInfo goto :EOF :error diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c index b21ec944c1..8a68ce0915 100644 --- a/src/nvim/mbyte.c +++ b/src/nvim/mbyte.c @@ -1367,7 +1367,7 @@ int utf16_to_utf8(const WCHAR *strw, char **str) return GetLastError(); } - *str = xmalloc(utf8_len); + *str = xmallocz(utf8_len); // Convert to UTF-8. utf8_len = WideCharToMultiByte(CP_UTF8, |