IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Avoid serializing NULL string through msgpack

Browse Source 
Attempting to serialize a NULL string through msgpack results in
msgpack_sbuffer_write attempting to memcpy from a NULL pointer, which is
undefined behavior.
This commit is contained in:
James McCoy 2016-11-17 18:16:46 -05:00
parent 38ee85d000
commit ca292c9768
No known key found for this signature in database
GPG Key ID: DFE691AE331BA3DB
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/msgpack_rpc/helpers.c
View File

@ -326,8 +326,10 @@ void msgpack_rpc_from_string(String result, msgpack_packer *res)
FUNC_ATTR_NONNULL_ARG(2) FUNC_ATTR_NONNULL_ARG(2)
{ {
msgpack_pack_str(res, result.size); msgpack_pack_str(res, result.size);
if (result.size > 0) {
msgpack_pack_str_body(res, result.data, result.size); msgpack_pack_str_body(res, result.data, result.size);
} }
}
typedef struct { typedef struct {
const Object *aobj; const Object *aobj;

2
src/nvim/shada.c
View File

@ -1575,7 +1575,9 @@ static char *shada_filename(const char *file)
do { \ do { \
const String s_ = (s); \ const String s_ = (s); \
msgpack_pack_bin(spacker, s_.size); \ msgpack_pack_bin(spacker, s_.size); \
if (s_.size > 0) { \
msgpack_pack_bin_body(spacker, s_.data, s_.size); \ msgpack_pack_bin_body(spacker, s_.data, s_.size); \
} \
} while (0) } while (0)
/// Write single ShaDa entry /// Write single ShaDa entry