From 8dd598e89f25074f2d4d23f77cb601cf48a810e3 Mon Sep 17 00:00:00 2001 From: Guido Vranken Date: Thu, 8 Jun 2017 00:44:15 +0200 Subject: [PATCH] refactor my_strupr Refactor my_strupr such that it will not check and possibly alter bytes after the string's null terminator for strings of length 0. Signed-off-by: Guido Vranken Acked-by: Gert Doering Message-Id: URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg14756.html Signed-off-by: Gert Doering (cherry picked from commit 69162924de3600bfe8ae9708a1d6e3f4515ef995) --- src/openvpn/ntlm.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/openvpn/ntlm.c b/src/openvpn/ntlm.c index 3390bdddf..ac66a2fac 100644 --- a/src/openvpn/ntlm.c +++ b/src/openvpn/ntlm.c @@ -130,13 +130,16 @@ gen_nonce (unsigned char *nonce) } } -unsigned char *my_strupr(unsigned char *str) -{ - /* converts string to uppercase in place */ - unsigned char *tmp = str;; +void +my_strupr(unsigned char *str) +{ + /* converts string to uppercase in place */ - do *str = toupper(*str); while (*(++str)); - return tmp; + while (*str) + { + *str = toupper(*str); + str++; + } } static int -- 2.47.2