From: W.C.A. Wijngaards Date: Wed, 17 Jun 2026 13:29:48 +0000 (+0200) Subject: - Fix that malloc failure in doq connection setup, does X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b5909d8d22e6cde8a0fd0cd8ba71c12a993bb9cf;p=thirdparty%2Funbound.git - Fix that malloc failure in doq connection setup, does not crash in doq connection delete later. Thanks to Qifan Zhang, Palo Alto Networks, for the report. --- diff --git a/doc/Changelog b/doc/Changelog index b3751dd5a..3678a06ef 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -23,6 +23,9 @@ partial RRset, and logs an error on failure, and cleans up the dname allocation. Thanks to Qifan Zhang, Palo Alto Networks, for the report. + - Fix that malloc failure in doq connection setup, does + not crash in doq connection delete later. Thanks to Qifan + Zhang, Palo Alto Networks, for the report. 16 June 2026: Wouter - Fix to disallow $INCLUDE for secondary zones. Start up diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c index e6174d750..03234ab9b 100644 --- a/services/listen_dnsport.c +++ b/services/listen_dnsport.c @@ -3626,7 +3626,8 @@ doq_conn_delete(struct doq_conn* conn, struct doq_table* table) lock_rw_unlock(&conn->table->conid_lock); /* Remove the app data from ngtcp2 before SSL_free of conn->ssl, * because the ngtcp2 conn is deleted. */ - SSL_set_app_data(conn->ssl, NULL); + if(conn->ssl) + SSL_set_app_data(conn->ssl, NULL); if(conn->stream_tree.count != 0) { traverse_postorder(&conn->stream_tree, stream_tree_del, table); }