[Openvpn-devel,v1] openvpnserv: always free the domains in UndoDnsSearchDomains()

Message ID 20261111163717.6369-1-gert@greenie.muc.de
State New
Headers
Series [Openvpn-devel,v1] openvpnserv: always free the domains in UndoDnsSearchDomains() |

Commit Message

Gert Doering Nov. 11, 2026, 4:37 p.m. UTC
  From: Razvan Cojocaru <razvanc@mailbox.org>

The domains string was only freed when the search list key could be
opened. Free it unconditionally, as the caller frees the undo data
right after.

Broken since ae90cbad ("dns: support multiple domains without DHCP").

Change-Id: Idf378bb5af0b2b4e8d746e252159b756e96c37fb
Signed-off-by: Razvan Cojocaru <razvanc@mailbox.org>
Acked-by: Antonio Quartulli <antonio@mandelbit.com>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2160
---

This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2160
This mail reflects revision 1 of this Change.

Acked-by according to Gerrit (reflected above):
Antonio Quartulli <antonio@mandelbit.com>
  

Patch

diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c
index 81205d6..710a797 100644
--- a/src/openvpnserv/interactive.c
+++ b/src/openvpnserv/interactive.c
@@ -1754,10 +1754,10 @@ 
         RemoveDnsSearchDomains(dns_searchlist_key, undo_data->domains);
         RegCloseKey(dns_searchlist_key);
         ApplyDnsSettings(gpol);
-
-        free(undo_data->domains);
-        undo_data->domains = NULL;
     }
+
+    free(undo_data->domains);
+    undo_data->domains = NULL;
 }
 
 /**