- 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 b3751dd5a147a4fbdd4725eef344f89f3ee8041b..3678a06efef4131466df2e6061b10cbe90857c5b 100644 (file)
--- 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 e6174d750a93bfd3591a9c88a6084e575ffd60f2..03234ab9bff151b17e724c278151d6880d44c827 100644 (file)
--- 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);
        }