From ed73972cdafeca4daca965a452dcd49cafa3b1c9 Mon Sep 17 00:00:00 2001
From: Rob McKenna <robm@openjdk.org>
Date: Tue, 28 Jun 2016 20:03:29 +0100
Subject: [PATCH] 8143640: Showing incorrect result while passing specific
 argument in the Java launcher tools

Reviewed-by: ksrini
---
 jdk/src/java.base/windows/native/libjli/cmdtoargs.c | 1 +
 jdk/test/tools/launcher/Arrrghs.java                | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/jdk/src/java.base/windows/native/libjli/cmdtoargs.c b/jdk/src/java.base/windows/native/libjli/cmdtoargs.c
index 80d66a9e324..02c5adf81c9 100644
--- a/jdk/src/java.base/windows/native/libjli/cmdtoargs.c
+++ b/jdk/src/java.base/windows/native/libjli/cmdtoargs.c
@@ -155,6 +155,7 @@ static char* next_arg(char* cmdline, char* arg, jboolean* wildcard) {
                 }
             }
             dest += copyCh(ch, dest);
+            slashes = 0;
             break;
 
         default:
diff --git a/jdk/test/tools/launcher/Arrrghs.java b/jdk/test/tools/launcher/Arrrghs.java
index 9045e010473..4d799f35efe 100644
--- a/jdk/test/tools/launcher/Arrrghs.java
+++ b/jdk/test/tools/launcher/Arrrghs.java
@@ -24,7 +24,7 @@
 /**
  * @test
  * @bug 5030233 6214916 6356475 6571029 6684582 6742159 4459600 6758881 6753938
- *      6894719 6968053 7151434 7146424 8007333 8077822
+ *      6894719 6968053 7151434 7146424 8007333 8077822 8143640
  * @summary Argument parsing validation.
  * @compile -XDignore.symbol.file Arrrghs.java
  * @run main/othervm Arrrghs
@@ -197,6 +197,8 @@ public class Arrrghs extends TestHelper {
         // more treatment of  mixed slashes
         checkArgumentParsing("f1/ f3\\ f4/", "f1/", "f3\\", "f4/");
         checkArgumentParsing("f1/ f2\' ' f3/ f4/", "f1/", "f2\'", "'", "f3/", "f4/");
+
+        checkArgumentParsing("a\\*\\b", "a\\*\\b");
     }
 
     private void initEmptyDir(File emptyDir) throws IOException {