upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-24 00:29:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Free memory leak in config strlist append.

Browse source 
- make sure nsec3 comparison salt is initialized.


git-svn-id: file:///svn/unbound/trunk@4900 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2018-09-13 10:23:30 +00:00
parent 90f0530234
commit 75b8b8c875
4 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/Changelog
View file

@ -7,6 +7,8 @@
- in testcode, free async ids, initialise array, and check for null - in testcode, free async ids, initialise array, and check for null
pointer during test of the test. And use exit for return to note pointer during test of the test. And use exit for return to note
irregular program stop. irregular program stop.
- Free memory leak in config strlist append.
- make sure nsec3 comparison salt is initialized.
11 September 2018: Wouter 11 September 2018: Wouter
- Fixed unused return value warnings in contrib/fastrpz.patch for - Fixed unused return value warnings in contrib/fastrpz.patch for

9
util/config_file.c
View file

@ -841,6 +841,7 @@ config_get_option(struct config_file* cfg, const char* opt,
{ {
char buf[1024], nopt[64]; char buf[1024], nopt[64];
size_t len = sizeof(buf); size_t len = sizeof(buf);
if(!opt) return 0;
if(opt && opt[strlen(opt)-1] == ':' && strlen(opt)<sizeof(nopt)) { if(opt && opt[strlen(opt)-1] == ':' && strlen(opt)<sizeof(nopt)) {
memmove(nopt, opt, strlen(opt)); memmove(nopt, opt, strlen(opt));
nopt[strlen(opt)-1] = 0; nopt[strlen(opt)-1] = 0;
@ -1526,11 +1527,15 @@ int ub_c_wrap(void)
int cfg_strlist_append(struct config_strlist_head* list, char* item) int cfg_strlist_append(struct config_strlist_head* list, char* item)
{ {
struct config_strlist *s; struct config_strlist *s;
if(!item || !list) if(!item || !list) {
free(item);
return 0; return 0;
}
s = (struct config_strlist*)calloc(1, sizeof(struct config_strlist)); s = (struct config_strlist*)calloc(1, sizeof(struct config_strlist));
if(!s) if(!s) {
free(item);
return 0; return 0;
}
s->str = item; s->str = item;
s->next = NULL; s->next = NULL;
if(list->last) if(list->last)

1
util/config_file.h
View file

@ -792,6 +792,7 @@ char* config_collate_cat(struct config_strlist* list);
* @param list: list head. zeroed at start. * @param list: list head. zeroed at start.
* @param item: new item. malloced by caller. if NULL the insertion fails. * @param item: new item. malloced by caller. if NULL the insertion fails.
* @return true on success. * @return true on success.
* on fail the item is free()ed.
*/ */
int cfg_strlist_append(struct config_strlist_head* list, char* item); int cfg_strlist_append(struct config_strlist_head* list, char* item);

12
validator/val_nsec3.c
View file

@ -520,6 +520,10 @@ nsec3_hash_cmp(const void* c1, const void* c2)
} }
(void)nsec3_get_salt(h1->nsec3, h1->rr, &s1, &s1len); (void)nsec3_get_salt(h1->nsec3, h1->rr, &s1, &s1len);
(void)nsec3_get_salt(h2->nsec3, h2->rr, &s2, &s2len); (void)nsec3_get_salt(h2->nsec3, h2->rr, &s2, &s2len);
if(s1len == 0 && s2len == 0)
return 0;
if(!s1) return -1;
if(!s2) return 1;
if(s1len != s2len) { if(s1len != s2len) {
if(s1len < s2len) if(s1len < s2len)
return -1; return -1;
@ -736,7 +740,7 @@ find_matching_nsec3(struct module_env* env, struct nsec3_filter* flt,
size_t i_rs; size_t i_rs;
int i_rr; int i_rr;
struct ub_packed_rrset_key* s; struct ub_packed_rrset_key* s;
struct nsec3_cached_hash* hash; struct nsec3_cached_hash* hash = NULL;
int r; int r;
/* this loop skips other-zone and unknown NSEC3s, also non-NSEC3 RRs */ /* this loop skips other-zone and unknown NSEC3s, also non-NSEC3 RRs */
@ -748,7 +752,7 @@ find_matching_nsec3(struct module_env* env, struct nsec3_filter* flt,
if(r == 0) { if(r == 0) {
log_err("nsec3: malloc failure"); log_err("nsec3: malloc failure");
break; /* alloc failure */ break; /* alloc failure */
} else if(r < 0) } else if(r != 1)
continue; /* malformed NSEC3 */ continue; /* malformed NSEC3 */
else if(nsec3_hash_matches_owner(flt, hash, s)) { else if(nsec3_hash_matches_owner(flt, hash, s)) {
*rrset = s; /* rrset with this name */ *rrset = s; /* rrset with this name */
@ -829,7 +833,7 @@ find_covering_nsec3(struct module_env* env, struct nsec3_filter* flt,
size_t i_rs; size_t i_rs;
int i_rr; int i_rr;
struct ub_packed_rrset_key* s; struct ub_packed_rrset_key* s;
struct nsec3_cached_hash* hash; struct nsec3_cached_hash* hash = NULL;
int r; int r;
/* this loop skips other-zone and unknown NSEC3s, also non-NSEC3 RRs */ /* this loop skips other-zone and unknown NSEC3s, also non-NSEC3 RRs */
@ -841,7 +845,7 @@ find_covering_nsec3(struct module_env* env, struct nsec3_filter* flt,
if(r == 0) { if(r == 0) {
log_err("nsec3: malloc failure"); log_err("nsec3: malloc failure");
break; /* alloc failure */ break; /* alloc failure */
} else if(r < 0) } else if(r != 1)
continue; /* malformed NSEC3 */ continue; /* malformed NSEC3 */
else if(nsec3_covers(flt->zone, hash, s, i_rr, else if(nsec3_covers(flt->zone, hash, s, i_rr,
env->scratch_buffer)) { env->scratch_buffer)) {