tor

commit 6945f2b3efb65f9812885e91179203621d37dd7a
parent 231036a110c1062e39b214b4b88fdc2a1eb46dc8
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 15 May 2019 07:41:34 -0400

Merge branch 'bug30475_035' into maint-0.3.5

Diffstat:
A
changes/bug30475
 | 
4
++++
M
src/feature/hs/hs_service.c
 | 
4
++--

2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/changes/bug30475 b/changes/bug30475
@@ -0,0 +1,4 @@
+  o Minor bugfixes ():
+    - Avoid a GCC 9.1.1 warning (and possible crash depending on libc
+      implemenation) when failing to load a hidden service client authorization
+      file.  Fixes bug 30475; bugfix on 0.3.5.1-alpha.
diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c
@@ -1259,16 +1259,16 @@ load_client_keys(hs_service_t *service)
     client_key_file_path = hs_path_from_filename(client_keys_dir_path,
                                                  filename);
     client_key_str = read_file_to_str(client_key_file_path, 0, NULL);
-    /* Free immediately after using it. */
-    tor_free(client_key_file_path);
 
     /* If we cannot read the file, continue with the next file. */
     if (!client_key_str)  {
       log_warn(LD_REND, "Client authorization file %s can't be read. "
                         "Corrupted or verify permission? Ignoring.",
                client_key_file_path);
+      tor_free(client_key_file_path);
       continue;
     }
+    tor_free(client_key_file_path);
 
     client = parse_authorized_client(client_key_str);
     /* Wipe and free immediately after using it. */