Skip to contentSkip to conversation

polarssl: fix unreachable code

PATCH In review Yegor Yefremov 3 participants 3 messages Nov 23, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 polarssl: fix unreachable code

Found via cppcheck and compile-tested.

---
 src/openvpn/ssl_polarssl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
src/openvpn/ssl_polarssl.c +1 -1
index b026a17..2036885 100644
@@ -846,8 +846,8 @@ key_state_write_plaintext (struct key_state_ssl *ks, struct buffer *buf)
 
   if (0 == buf->len)
     {
-      return 0;
       perf_pop ();
+      return 0;
     }
 
   retval = ssl_write(ks->ctx, BPTR(buf), buf->len);
Signature · 1 line
1.8.3.2
#1 lore raw

ACK. Harmless, but definitely an oversight.

-Steffan

Quoted 22 lines · Yegor Yefremov

Found via cppcheck and compile-tested.

---
 src/openvpn/ssl_polarssl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
src/openvpn/ssl_polarssl.c +1 -1
index b026a17..2036885 100644
@@ -846,8 +846,8 @@ key_state_write_plaintext (struct key_state_ssl *ks, struct buffer *buf)
 
   if (0 == buf->len)
     {
-      return 0;
       perf_pop ();
+      return 0;
     }
 
   retval = ssl_write(ks->ctx, BPTR(buf), buf->len);
#2 lore raw
In reply to Yegor Yefremov

Your patch has been applied to the master branch.

commit 98c5de769d6bcd4822b2fd81ae4f4b05edff5c0e

Author: Yegor Yefremov
Date:   Sun Nov 23 13:21:43 2014 +0100
     polarssl: fix unreachable code

     Signed-off-by: Yegor Yefremov <[email protected]...>
     Acked-by: Steffan Karger <[email protected]...>
     Message-Id: <[email protected]...>
     URL: http://article.gmane.org/gmane.network.openvpn.devel/9266
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering