[Openvpn-devel] ssl.c: remove unneeded local variable

Message ID 20200217092009.238-1-lstipakov@gmail.com
State Changes Requested
Headers show
Series
  • [Openvpn-devel] ssl.c: remove unneeded local variable
Related show

Commit Message

Lev Stipakov Feb. 17, 2020, 9:20 a.m.
From: Lev Stipakov <lev@openvpn.net>

Remove unneeded _orig variable, which stores
pointer to tokenized string. Unlike strsep(), strtok()
doesn't modify pointer itself, only string, so it is safe
to call free() on that pointer.

Signed-off-by: Lev Stipakov <lev@openvpn.net>
---
 src/openvpn/ssl.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Arne Schwabe Feb. 17, 2020, 9:55 a.m. | #1
Am 17.02.20 um 10:20 schrieb Lev Stipakov:
> From: Lev Stipakov <lev@openvpn.net>
> 
> Remove unneeded _orig variable, which stores
> pointer to tokenized string. Unlike strsep(), strtok()
> doesn't modify pointer itself, only string, so it is safe
> to call free() on that pointer.
> 

Can we just wait with style patches like that that create conflicts with
 a large patchset like my NCP patchset until those larger patches are
handled?

Arne

Patch

diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c
index e708fc93..b92aada3 100644
--- a/src/openvpn/ssl.c
+++ b/src/openvpn/ssl.c
@@ -1918,7 +1918,6 @@  bool
 tls_item_in_cipher_list(const char *item, const char *list)
 {
     char *tmp_ciphers = string_alloc(list, NULL);
-    char *tmp_ciphers_orig = tmp_ciphers;
 
     const char *token = strtok(tmp_ciphers, ":");
     while (token)
@@ -1929,7 +1928,7 @@  tls_item_in_cipher_list(const char *item, const char *list)
         }
         token = strtok(NULL, ":");
     }
-    free(tmp_ciphers_orig);
+    free(tmp_ciphers);
 
     return token != NULL;
 }