8262351: Extra '0' in java.util.Formatter for '%012a' conversion with…

… a sign character

Reviewed-by: bchristi, naoto

src/java.base/share/classes/java/util/Formatter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, 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
@@ -3554,7 +3554,12 @@ else if (precision == 0)
                 sb.append(upper ? "0X" : "0x");
 
                 if (f.contains(Flags.ZERO_PAD)) {
-                    trailingZeros(sb, width - s.length() - 2);
+                    int leadingCharacters = 2;
+                    if(f.contains(Flags.LEADING_SPACE) ||
+                            f.contains(Flags.PLUS) || neg) {
+                        leadingCharacters = 3;
+                    }
+                    trailingZeros(sb, width - s.length() - leadingCharacters);
                 }
 
                 int idx = s.indexOf('p');

test/jdk/java/util/Formatter/HexFloatZeroPadding.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8262351
+ * @summary Incorrect zero padding occurs in the presence of some leading sign
+ * flags for hexadecimal floating point conversions.
+ * @run testng HexFloatZeroPadding
+ */
+
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+
+@Test
+public class HexFloatZeroPadding {
+
+    public void testCorrectWidthHexFloatZeroPadding()
+    {
+        final int EXPECTEDLENGTH = 12;
+        assertEquals(String.format("|%010a|", 0.0).length(), EXPECTEDLENGTH);
+        assertEquals(String.format("|% 010a|", 0.0).length(), EXPECTEDLENGTH);
+        assertEquals(String.format("|%+010a|", 0.0).length(), EXPECTEDLENGTH);
+        assertEquals(String.format("|%010a|", -0.0).length(), EXPECTEDLENGTH);
+        assertEquals(String.format("|% 010a|", -0.0).length(), EXPECTEDLENGTH);
+        assertEquals(String.format("|%+010a|", -0.0).length(), EXPECTEDLENGTH);
+    }
+
+}