kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-26 14:11:15 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings: spell.c: getroom(): Np dereference: FP/RI.

Browse Source 
Problem    : Dereference of null pointer @ 6089.
Diagnostic : False positive / Real issue.
Rationale  : From the code, it seems the intent is that len parameter
             should never exceed SBLOCKSIZE. But the code checking for
             that does in fact cause a null pointer dereference just
             immediately after.
Resolution : State precondition in doc and assert it at entry.
This commit is contained in:
Eliseo Martínez 2014-11-13 20:27:33 +01:00
parent 5f9cacbf32
commit 1adfb558f5
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/spell.c
View File

@ -304,6 +304,7 @@
#include "nvim/ex_cmds2.h" #include "nvim/ex_cmds2.h"
#include "nvim/ex_docmd.h" #include "nvim/ex_docmd.h"
#include "nvim/fileio.h" #include "nvim/fileio.h"
#include "nvim/func_attr.h"
#include "nvim/getchar.h" #include "nvim/getchar.h"
#include "nvim/hashtab.h" #include "nvim/hashtab.h"
#include "nvim/mbyte.h" #include "nvim/mbyte.h"
@ -6072,14 +6073,17 @@ static int spell_read_wordfile(spellinfo_T *spin, char_u *fname)
/// track of them). /// track of them).
/// The memory is cleared to all zeros. /// The memory is cleared to all zeros.
/// ///
/// @param len Length needed. /// @param len Length needed (<= SBLOCKSIZE).
/// @param align Align for pointer. /// @param align Align for pointer.
/// @return NULL when out of memory. /// @return Pointer into block data.
static void *getroom(spellinfo_T *spin, size_t len, bool align) static void *getroom(spellinfo_T *spin, size_t len, bool align)
FUNC_ATTR_NONNULL_RET
{ {
char_u *p; char_u *p;
sblock_T *bl = spin->si_blocks; sblock_T *bl = spin->si_blocks;
assert(len <= SBLOCKSIZE);
if (align && bl != NULL) if (align && bl != NULL)
// Round size up for alignment. On some systems structures need to be // Round size up for alignment. On some systems structures need to be
// aligned to the size of a pointer (e.g., SPARC). // aligned to the size of a pointer (e.g., SPARC).
@ -6087,11 +6091,8 @@ static void *getroom(spellinfo_T *spin, size_t len, bool align)
& ~(sizeof(char *) - 1); & ~(sizeof(char *) - 1);
if (bl == NULL || bl->sb_used + len > SBLOCKSIZE) { if (bl == NULL || bl->sb_used + len > SBLOCKSIZE) {
if (len >= SBLOCKSIZE) // Allocate a block of memory. It is not freed until much later.
bl = NULL; bl = xcalloc(1, (sizeof(sblock_T) + SBLOCKSIZE));
else
// Allocate a block of memory. It is not freed until much later.
bl = xcalloc(1, (sizeof(sblock_T) + SBLOCKSIZE));
bl->sb_next = spin->si_blocks; bl->sb_next = spin->si_blocks;
spin->si_blocks = bl; spin->si_blocks = bl;
bl->sb_used = 0; bl->sb_used = 0;