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

- bug #452: fix crash on assert in mesh_state_attachment.

Browse source 
git-svn-id: file:///svn/unbound/trunk@2683 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2012-06-11 12:04:58 +00:00
parent 8903dd175a
commit c42a74b77c
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Changelog
View file

@ -1,3 +1,6 @@
11 June 2012: Wouter
- bug #452: fix crash on assert in mesh_state_attachment.
30 May 2012: Wouter 30 May 2012: Wouter
- silence warning from swig-generated code (md set but not used in - silence warning from swig-generated code (md set but not used in
swig initmodule, due to ifdefs in swig-generated code). swig initmodule, due to ifdefs in swig-generated code).

16
services/mesh.c
View file

@ -735,16 +735,20 @@ int mesh_state_attachment(struct mesh_state* super, struct mesh_state* sub)
superref->s = super; superref->s = super;
subref->node.key = subref; subref->node.key = subref;
subref->s = sub; subref->s = sub;
#ifdef UNBOUND_DEBUG if(!rbtree_insert(&sub->super_set, &superref->node)) {
n = /* this should not happen, iterator and validator do not
#endif * attach subqueries that are identical. */
rbtree_insert(&sub->super_set, &superref->node); /* already attached, we are done, nothing todo.
log_assert(n != NULL); * since superref and subref already allocated in region,
* we cannot free them */
return 1;
}
#ifdef UNBOUND_DEBUG #ifdef UNBOUND_DEBUG
n = n =
#endif #endif
rbtree_insert(&super->sub_set, &subref->node); rbtree_insert(&super->sub_set, &subref->node);
log_assert(n != NULL); log_assert(n != NULL); /* we checked above if statement, the reverse
administration should not fail now, unless they are out of sync */
return 1; return 1;
} }