[tor-commits] [tor/master] Fix a low-impact memory leak in options_act_reversible()

[teor at torproject.org]

commit ff7d0ebcfe54223e092bfb8c4f9e6b11c5ef6627
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 22 09:04:36 2019 -0500

    Fix a low-impact memory leak in options_act_reversible()
    
    Found by Coverity as CID 1455953
    
    Fixes bug 32575; bug not in any released Tor.
---
 src/app/config/config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index e61281dac..34f20c31c 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -1945,7 +1945,7 @@ options_act_reversible,(const or_options_t *old_options, char **msg))
 
   if (first_time) {
     if (options_switch_id(msg) < 0)
-      goto done;
+      goto rollback;
   }
 
   /* On the other hand, we need to touch the file system _after_ we
@@ -1954,7 +1954,7 @@ options_act_reversible,(const or_options_t *old_options, char **msg))
    */
   if (first_time) {
     if (options_create_directories(msg) < 0)
-      goto done;
+      goto rollback;
   }
 
   /* Bail out at this point if we're not going to be a client or server: