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

- Fix 775: unbound-host and unbound-anchor crash on windows, ignore

Browse source 
null delete for wsaevent.


git-svn-id: file:///svn/unbound/trunk@3784 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2016-06-14 07:23:08 +00:00
parent 2fffe65332
commit 034febc8e3
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/Changelog
View file

@ -1,3 +1,7 @@
14 June 2016: Ralph
- Fix 775: unbound-host and unbound-anchor crash on windows, ignore
null delete for wsaevent.
13 June 2016: Ralph 13 June 2016: Ralph
- Use QTYPE=A for QNAME minimisation. - Use QTYPE=A for QNAME minimisation.
- Keep track of number of time-outs when performing QNAME minimisation. - Keep track of number of time-outs when performing QNAME minimisation.

8
util/ub_event_pluggable.c
View file

@ -597,7 +597,7 @@ ub_event_add(struct ub_event* ev, struct timeval* tv)
int int
ub_event_del(struct ub_event* ev) ub_event_del(struct ub_event* ev)
{ {
if (ev->magic == UB_EVENT_MAGIC) { if (ev && ev->magic == UB_EVENT_MAGIC) {
fptr_ok(ev->vmt != &default_event_vmt || fptr_ok(ev->vmt != &default_event_vmt ||
ev->vmt->del == my_event_del); ev->vmt->del == my_event_del);
return (*ev->vmt->del)(ev); return (*ev->vmt->del)(ev);
@ -620,7 +620,7 @@ ub_timer_add(struct ub_event* ev, struct ub_event_base* base,
int int
ub_timer_del(struct ub_event* ev) ub_timer_del(struct ub_event* ev)
{ {
if (ev->magic == UB_EVENT_MAGIC) { if (ev && ev->magic == UB_EVENT_MAGIC) {
fptr_ok(ev->vmt != &default_event_vmt || fptr_ok(ev->vmt != &default_event_vmt ||
ev->vmt->del_timer == my_timer_del); ev->vmt->del_timer == my_timer_del);
return (*ev->vmt->del_timer)(ev); return (*ev->vmt->del_timer)(ev);
@ -642,7 +642,7 @@ ub_signal_add(struct ub_event* ev, struct timeval* tv)
int int
ub_signal_del(struct ub_event* ev) ub_signal_del(struct ub_event* ev)
{ {
if (ev->magic == UB_EVENT_MAGIC) { if (ev && ev->magic == UB_EVENT_MAGIC) {
fptr_ok(ev->vmt != &default_event_vmt || fptr_ok(ev->vmt != &default_event_vmt ||
ev->vmt->del_signal == my_signal_del); ev->vmt->del_signal == my_signal_del);
return (*ev->vmt->del_signal)(ev); return (*ev->vmt->del_signal)(ev);
@ -653,7 +653,7 @@ ub_signal_del(struct ub_event* ev)
void void
ub_winsock_unregister_wsaevent(struct ub_event* ev) ub_winsock_unregister_wsaevent(struct ub_event* ev)
{ {
if (ev->magic == UB_EVENT_MAGIC) { if (ev && ev->magic == UB_EVENT_MAGIC) {
fptr_ok(ev->vmt != &default_event_vmt || fptr_ok(ev->vmt != &default_event_vmt ||
ev->vmt->winsock_unregister_wsaevent == ev->vmt->winsock_unregister_wsaevent ==
my_winsock_unregister_wsaevent); my_winsock_unregister_wsaevent);