src/java.base/windows/native/libjli/cmdtoargs.c

rev 11654 : imported patch libjli

*** 75,85 ****
      // character encoded in CP_ACP.
      USHORT prev = 0;
      USHORT ch = 0;
      int i;
      jboolean done = JNI_FALSE;
!     int charLength;
  
      *wildcard = JNI_FALSE;
      while (!done) {
          charLength = CharNextExA(CP_ACP, src, 0) - src;
          if (charLength == 0) {
--- 75,85 ----
      // character encoded in CP_ACP.
      USHORT prev = 0;
      USHORT ch = 0;
      int i;
      jboolean done = JNI_FALSE;
!     size_t charLength;
  
      *wildcard = JNI_FALSE;
      while (!done) {
          charLength = CharNextExA(CP_ACP, src, 0) - src;
          if (charLength == 0) {
*** 206,219 ****
          src = next_arg(src, arg, &wildcard);
          // resize to accommodate another Arg
          argv = (StdArg*) JLI_MemRealloc(argv, (nargs+1) * sizeof(StdArg));
          argv[nargs].arg = JLI_StringDup(arg);
          argv[nargs].has_wildcard = wildcard;
!         *arg = NULL;
          nargs++;
      } while (src != NULL);
  
      stdargc = nargs;
      stdargs = argv;
  }
  
  #ifdef IDE_STANDALONE
--- 206,221 ----
          src = next_arg(src, arg, &wildcard);
          // resize to accommodate another Arg
          argv = (StdArg*) JLI_MemRealloc(argv, (nargs+1) * sizeof(StdArg));
          argv[nargs].arg = JLI_StringDup(arg);
          argv[nargs].has_wildcard = wildcard;
!         *arg = '\0';
          nargs++;
      } while (src != NULL);
  
+     JLI_MemFree(arg);
+ 
      stdargc = nargs;
      stdargs = argv;
  }
  
  #ifdef IDE_STANDALONE