Paul Gofman : nsiproxy.sys: Fix ipv6 route table parsing on Linux.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ee069253197a518d3226843f7f23f41c6fe1ef3b
URL:    https://gitlab.winehq.org/wine/wine/-/commit/ee069253197a518d3226843f7f23f41...

Author: Paul Gofman 
Date:   Fri Feb 23 19:13:16 2024 -0600

nsiproxy.sys: Fix ipv6 route table parsing on Linux.

---

dlls/nsiproxy.sys/ip.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c
index fe49caa6e57..09f033ac634 100644
--- a/dlls/nsiproxy.sys/ip.c
+++ b/dlls/nsiproxy.sys/ip.c
@@ -1544,7 +1544,7 @@ struct in6_addr str_to_in6_addr(char *nptr, char **endptr)

for (int i = 0; i < sizeof(ret); i++)
     {
-        if (!isxdigit( *nptr ) || !isxdigit( *nptr + 1 ))
+        if (!isxdigit( *nptr ) || !isxdigit( *(nptr + 1) ))
         {
             /* invalid hex string */
             if (endptr) *endptr = nptr;
@@ -1574,7 +1574,7 @@ static NTSTATUS ipv6_forward_enumerate_all( void *key_data, UINT key_size, void

#ifdef __linux__
     {
-        char buf[512], *ptr;
+        char buf[512], *ptr, *end;
         UINT rtf_flags;
         FILE *fp;

@@ -1582,9 +1582,6 @@ static NTSTATUS ipv6_forward_enumerate_all( void *key_data, UINT key_size, void

while ((ptr = fgets( buf, sizeof(buf), fp )))
         {
-            while (!isspace( *ptr )) ptr++;
-            *ptr++ = '\0';
-
             entry.prefix = str_to_in6_addr( ptr, &ptr );
             entry.prefix_len = strtoul( ptr + 1, &ptr, 16 );
             str_to_in6_addr( ptr + 1, &ptr ); /* source network, skip */
@@ -1597,6 +1594,10 @@ static NTSTATUS ipv6_forward_enumerate_all( void *key_data, UINT key_size, void
             entry.protocol = (rtf_flags & RTF_GATEWAY) ? MIB_IPPROTO_NETMGMT : MIB_IPPROTO_LOCAL;
             entry.loopback = entry.protocol == MIB_IPPROTO_LOCAL && entry.prefix_len == 32;

+            while (isspace( *ptr )) ptr++;
+            end = ptr;
+            while (*end && !isspace(*end)) ++end;
+            *end = 0;
             if (!convert_unix_name_to_luid( ptr, &entry.luid )) continue;
             if (!convert_luid_to_index( &entry.luid, &entry.if_index )) continue;