Mercurial > hg > release > icedtea7-forest-2.6 > jdk

changeset 9683:2516b530fac3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8199166: Better interface lists Reviewed-by: igerasim, mschoene, michaelm, rhalade
author chegar
date Fri, 10 Aug 2018 14:35:44 +0100
parents 979a2946879c
children e8b8ef2ce891
files src/windows/native/java/net/NetworkInterface.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/native/java/net/NetworkInterface.c	Wed Aug 15 12:13:20 2018 -0700
+++ b/src/windows/native/java/net/NetworkInterface.c	Fri Aug 10 14:35:44 2018 +0100
@@ -264,7 +264,7 @@
                 // But in rare case it fails, we allow 'char' to be displayed
                 curr->displayName = (char *)malloc(ifrowP->dwDescrLen + 1);
             } else {
-                curr->displayName = (wchar_t *)malloc(wlen*(sizeof(wchar_t))+1);
+                curr->displayName = (wchar_t *)malloc((wlen+1)*sizeof(wchar_t));
             }
 
             curr->name = (char *)malloc(strlen(dev_name) + 1);
@@ -307,7 +307,7 @@
                 free(curr);
                 return -1;
             } else {
-                curr->displayName[wlen*(sizeof(wchar_t))] = '\0';
+                ((wchar_t *)curr->displayName)[wlen] = L'\0';
                 curr->dNameIsUnicode = TRUE;
             }
         }