src/java.base/windows/native/libjava/java_props_md.c

rev 51878 : 8211149: fix potential memleak in getJavaIDFromLangID after failing SetupI18nProps call [windows]
rev 49213 : 8199470: Remove unused property file.encoding.pkg
Reviewed-by: bpb, sherman
rev 47216 : 8187443: Forest Consolidation: Move files to unified layout
Reviewed-by: darcy, ihse

*** 168,177 ****
--- 168,181 ----
      ret = malloc(SNAMESIZE);
      if (ret == NULL) {
          return NULL;
      }
  
+     for (index = 0; index < 5; index++) {
+         elems[index] = NULL;
+     }
+ 
      if (SetupI18nProps(MAKELCID(langID, SORT_DEFAULT),
                     &(elems[0]), &(elems[1]), &(elems[2]), &(elems[3]), &(elems[4]))) {
  
          // there always is the "language" tag
          strcpy(ret, elems[0]);
*** 186,195 ****
--- 190,202 ----
  
          for (index = 0; index < 5; index++) {
              free(elems[index]);
          }
      } else {
+         for (index = 0; index < 5; index++) {
+             if (elems[index] != NULL) { free(elems[index]); }
+         }
          free(ret);
          ret = NULL;
      }
  
      return ret;