collabvm/r3
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix Coverity warning

Browse source 
The return value was checked on all calls to r3_slug_find_placeholder()
except in one place, which triggered a Coverity warning.

This adds a check (assert), and enables the other asserts for non-debug
builds to catch segmentation faults early.
This commit is contained in:
Björn Svensson 2021-11-08 14:49:12 +01:00
parent cfed420cd3
commit 04d52a6dd1
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/node.c
View file

@ -720,18 +720,11 @@ R3Node * r3_tree_insert_pathl_ex(R3Node *tree, const char *path, unsigned int pa
if ( slug_cnt > 1 ) { if ( slug_cnt > 1 ) {
unsigned int slug_len; unsigned int slug_len;
const char *p = r3_slug_find_placeholder(path, path_len, &slug_len); const char *p = r3_slug_find_placeholder(path, path_len, &slug_len);
#ifdef DEBUG
assert(p); assert(p);
#endif
// find the next one '{', then break there // find the next one '{', then break there
if(p) { p = r3_slug_find_placeholder(p + slug_len + 1, path_len - slug_len - 1, NULL);
p = r3_slug_find_placeholder(p + slug_len + 1, path_len - slug_len - 1, NULL);
}
#ifdef DEBUG
assert(p); assert(p);
#endif
// insert the first one edge, and break at "p" // insert the first one edge, and break at "p"
R3Node * child = r3_tree_create(3); R3Node * child = r3_tree_create(3);
@ -745,6 +738,7 @@ R3Node * r3_tree_insert_pathl_ex(R3Node *tree, const char *path, unsigned int pa
// there is one slug, let's see if it's optimiz-able by opcode // there is one slug, let's see if it's optimiz-able by opcode
unsigned int slug_len = 0; unsigned int slug_len = 0;
const char *slug_p = r3_slug_find_placeholder(path, path_len, &slug_len); const char *slug_p = r3_slug_find_placeholder(path, path_len, &slug_len);
assert(slug_p);
unsigned int slug_pattern_len = 0; unsigned int slug_pattern_len = 0;
const char *slug_pattern = r3_slug_find_pattern(slug_p, slug_len, &slug_pattern_len); const char *slug_pattern = r3_slug_find_pattern(slug_p, slug_len, &slug_pattern_len);