mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-01-05 21:07:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #6670 from jamessan/conversion-overflow

Browse Source
This commit is contained in:
Justin M. Keyes
2017-05-04 08:46:40 +02:00
committed by GitHub
parent 2b3cb2c448 b9dba14fa3
commit 2e3b78d10b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ci/build.bat
View File

@@ -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

2
src/nvim/mbyte.c
View File

@@ -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,