7190219: (bf) CharBuffer.put(String,int,int) modifies position even if BufferOverflowException thrown

Reviewed-by: alanb

jdk/src/share/classes/java/nio/X-Buffer.java.template

@@ -888,6 +888,8 @@ public abstract class $Type$Buffer
      */
     public $Type$Buffer put(String src, int start, int end) {
         checkBounds(start, end - start, src.length());
+        if (end - start > remaining())
+            throw new BufferOverflowException();
         for (int i = start; i < end; i++)
             this.put(src.charAt(i));
         return this;

jdk/test/java/nio/Buffer/Basic-X.java.template

@@ -402,6 +402,19 @@ public class Basic$Type$
         ck(b, b.charAt(1), 'f');
         ck(b, b.subSequence(1, 3).toString().equals("fg"));
 
+        // String ops
+
+        // 7190219
+        b.clear();
+        int pos = b.position();
+        tryCatch(b, BufferOverflowException.class, new Runnable() {
+            public void run() {
+                b.put(String.valueOf(new char[b.capacity() + 1]), 0,
+                        b.capacity() + 1);
+            }});
+        ck(b, b.position(), pos);
+        relGet(b);
+
 #end[char]
 
         // Compact

jdk/test/java/nio/Buffer/Basic.java

@@ -25,7 +25,7 @@
  * @summary Unit test for buffers
  * @bug 4413135 4414911 4416536 4416562 4418782 4471053 4472779 4490253 4523725
  *      4526177 4463011 4660660 4661219 4663521 4782970 4804304 4938424 6231529
- *      6221101 6234263 6535542 6591971 6593946 6795561
+ *      6221101 6234263 6535542 6591971 6593946 6795561 7190219
  * @author Mark Reinhold
  */
 

jdk/test/java/nio/Buffer/BasicByte.java

@@ -396,6 +396,19 @@ public class BasicByte
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

jdk/test/java/nio/Buffer/BasicChar.java

@@ -402,6 +402,19 @@ public class BasicChar
         ck(b, b.charAt(1), 'f');
         ck(b, b.subSequence(1, 3).toString().equals("fg"));
 
+        // String ops
+
+        // 7190219
+        b.clear();
+        int pos = b.position();
+        tryCatch(b, BufferOverflowException.class, new Runnable() {
+            public void run() {
+                b.put(String.valueOf(new char[b.capacity() + 1]), 0,
+                        b.capacity() + 1);
+            }});
+        ck(b, b.position(), pos);
+        relGet(b);
+
 
 
         // Compact

jdk/test/java/nio/Buffer/BasicDouble.java

@@ -396,6 +396,19 @@ public class BasicDouble
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

jdk/test/java/nio/Buffer/BasicFloat.java

@@ -396,6 +396,19 @@ public class BasicFloat
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

jdk/test/java/nio/Buffer/BasicInt.java

@@ -396,6 +396,19 @@ public class BasicInt
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

jdk/test/java/nio/Buffer/BasicLong.java

@@ -396,6 +396,19 @@ public class BasicLong
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

jdk/test/java/nio/Buffer/BasicShort.java

@@ -396,6 +396,19 @@ public class BasicShort
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+