8304685: Fix whitespace parsing in libjdwp

kevinjwalls · kevinjwalls · commit 939344b8433b · 2023-05-19T18:57:55.000Z
Reviewed-by: cjplummer, amenkov, sspitsyn
diff --git a/src/jdk.jdwp.agent/unix/native/libjdwp/exec_md.c b/src/jdk.jdwp.agent/unix/native/libjdwp/exec_md.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -85,10 +85,10 @@ dbgsysExec(char *cmdLine)
     }
 
     for (i = 0, p = args; i < argc; i++) {
+        p = skipWhitespace(p); // no-op on first iteration
         argv[i] = p;
         p = skipNonWhitespace(p);
         *p++ = '\0';
-        p = skipWhitespace(p);
     }
     argv[i] = NULL;  /* NULL terminate */
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -85,10 +85,10 @@ dbgsysExec(char *cmdLine)`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`for (i = 0, p = args; i < argc; i++) {`
	`88`	`+ p = skipWhitespace(p); // no-op on first iteration`
`88`	`89`	`argv[i] = p;`
`89`	`90`	`p = skipNonWhitespace(p);`
`90`	`91`	`*p++ = '\0';`
`91`		`- p = skipWhitespace(p);`
`92`	`92`	`}`
`93`	`93`	`argv[i] = NULL; /* NULL terminate */`
`94`	`94`