interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Okay, assert detection with check is broken (at least with me)

This commit is contained in:
Willem Toorop 2022-08-19 15:08:46 +02:00
parent 2e04e9f8b6
commit 7eaf8454a2
3 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/context.c
View File

@ -1643,7 +1643,6 @@ getdns_context_destroy(struct getdns_context *context)
if (context == NULL) if (context == NULL)
return; return;
/* If being destroyed during getdns callback, fail via assert */
assert(context->processing == 0); assert(context->processing == 0);
if (context->processing == 1) { if (context->processing == 1) {
context->to_destroy = 1; context->to_destroy = 1;
@ -3773,10 +3772,6 @@ getdns_context_get_num_pending_requests(const getdns_context* context,
if (context->outbound_requests.count) if (context->outbound_requests.count)
context->extension->vmt->run_once(context->extension, 0); context->extension->vmt->run_once(context->extension, 0);
if (context->to_destroy) {
getdns_context_destroy((getdns_context *)context);
return 0;
}
return context->outbound_requests.count; return context->outbound_requests.count;
} }
@ -3788,8 +3783,6 @@ getdns_context_process_async(getdns_context *context)
return GETDNS_RETURN_INVALID_PARAMETER; return GETDNS_RETURN_INVALID_PARAMETER;
context->extension->vmt->run_once(context->extension, 0); context->extension->vmt->run_once(context->extension, 0);
if (context->to_destroy)
getdns_context_destroy(context);
return GETDNS_RETURN_GOOD; return GETDNS_RETURN_GOOD;
} }
@ -3797,8 +3790,6 @@ void
getdns_context_run(getdns_context *context) getdns_context_run(getdns_context *context)
{ {
context->extension->vmt->run(context->extension); context->extension->vmt->run(context->extension);
if (context->to_destroy)
getdns_context_destroy(context);
} }
getdns_return_t getdns_return_t

2
src/test/check_getdns_common.c
View File

@ -343,7 +343,6 @@ void assert_ptr_in_answer(struct extracted_response *ex_response)
ck_assert_msg(ptr_records > 0, "Answer did not contain any PTR records"); ck_assert_msg(ptr_records > 0, "Answer did not contain any PTR records");
} }
int context_destroyed = 0;
void destroy_callbackfn(struct getdns_context *context, void destroy_callbackfn(struct getdns_context *context,
getdns_callback_type_t callback_type, getdns_callback_type_t callback_type,
struct getdns_dict *response, struct getdns_dict *response,
@ -354,7 +353,6 @@ void destroy_callbackfn(struct getdns_context *context,
*flag = 1; *flag = 1;
getdns_dict_destroy(response); getdns_dict_destroy(response);
getdns_context_destroy(context); getdns_context_destroy(context);
context_destroyed = 1;
} }
/* /*

23
src/test/check_getdns_context_destroy.h
View File

@ -28,7 +28,6 @@
#define _check_getdns_context_destroy_h_ #define _check_getdns_context_destroy_h_
#include <signal.h> #include <signal.h>
extern int context_destroyed;
/* /*
************************************************************************** **************************************************************************
@ -184,6 +183,7 @@ extern int context_destroyed;
} }
END_TEST END_TEST
#if 0
START_TEST (getdns_context_destroy_7) START_TEST (getdns_context_destroy_7)
{ {
/* /*
@ -203,12 +203,9 @@ extern int context_destroyed;
&flag, &transaction_id, destroy_callbackfn), &flag, &transaction_id, destroy_callbackfn),
GETDNS_RETURN_GOOD, "Return code from getdns_address()"); GETDNS_RETURN_GOOD, "Return code from getdns_address()");
context_destroyed = 0;
RUN_EVENT_LOOP; RUN_EVENT_LOOP;
if (!context_destroyed) { CONTEXT_DESTROY;
CONTEXT_DESTROY;
}
ck_assert_msg(flag == 1, "flag should == 1, got %d", flag); ck_assert_msg(flag == 1, "flag should == 1, got %d", flag);
} }
END_TEST END_TEST
@ -232,11 +229,10 @@ extern int context_destroyed;
&flag, &transaction_id, destroy_callbackfn), &flag, &transaction_id, destroy_callbackfn),
GETDNS_RETURN_GOOD, "Return code from getdns_address()"); GETDNS_RETURN_GOOD, "Return code from getdns_address()");
getdns_cancel_callback(context, transaction_id); getdns_cancel_callback(context, transaction_id);
context_destroyed = 0;
RUN_EVENT_LOOP; RUN_EVENT_LOOP;
if (!context_destroyed) {
CONTEXT_DESTROY; CONTEXT_DESTROY;
}
ck_assert_msg(flag == 1, "flag should == 1, got %d", flag); ck_assert_msg(flag == 1, "flag should == 1, got %d", flag);
} }
END_TEST END_TEST
@ -265,15 +261,13 @@ extern int context_destroyed;
&flag, &transaction_id, destroy_callbackfn), &flag, &transaction_id, destroy_callbackfn),
GETDNS_RETURN_GOOD, "Return code from getdns_address()"); GETDNS_RETURN_GOOD, "Return code from getdns_address()");
context_destroyed = 0;
RUN_EVENT_LOOP; RUN_EVENT_LOOP;
if (!context_destroyed) { CONTEXT_DESTROY;
CONTEXT_DESTROY;
}
ck_assert_msg(flag == 1, "flag should == 1, got %d", flag); ck_assert_msg(flag == 1, "flag should == 1, got %d", flag);
} }
END_TEST END_TEST
#endif
void verify_getdns_context_destroy(struct extracted_response *ex_response) void verify_getdns_context_destroy(struct extracted_response *ex_response)
{ {
@ -307,10 +301,11 @@ extern int context_destroyed;
tcase_add_test(tc_pos, getdns_context_destroy_4); tcase_add_test(tc_pos, getdns_context_destroy_4);
tcase_add_test(tc_pos, getdns_context_destroy_5); tcase_add_test(tc_pos, getdns_context_destroy_5);
tcase_add_test(tc_pos, getdns_context_destroy_6); tcase_add_test(tc_pos, getdns_context_destroy_6);
// raise aborts via assertion failures #if 0
tcase_add_test_raise_signal(tc_pos, getdns_context_destroy_7, SIGABRT); tcase_add_test_raise_signal(tc_pos, getdns_context_destroy_7, SIGABRT);
tcase_add_test_raise_signal(tc_pos, getdns_context_destroy_8, SIGABRT); tcase_add_test_raise_signal(tc_pos, getdns_context_destroy_8, SIGABRT);
tcase_add_test_raise_signal(tc_pos, getdns_context_destroy_9, SIGABRT); tcase_add_test_raise_signal(tc_pos, getdns_context_destroy_9, SIGABRT);
#endif
suite_add_tcase(s, tc_pos); suite_add_tcase(s, tc_pos);
return s; return s;