--- old/src/java.base/share/classes/jdk/internal/jimage/UTF8String.java	2015-11-11 21:05:46.644592200 +0530
+++ new/src/java.base/share/classes/jdk/internal/jimage/UTF8String.java	2015-11-11 21:05:46.109561600 +0530
@@ -258,10 +258,10 @@
 
     @Override
     public String toString() {
-        ByteBuffer buffer = ByteBuffer.allocate(bytes.length+2);
+        ByteBuffer buffer = ByteBuffer.allocate(count+2);
         buffer.order(ByteOrder.BIG_ENDIAN);
-        buffer.putShort((short)bytes.length);
-        buffer.put(bytes);
+        buffer.putShort((short)count);
+        buffer.put(bytes, offset, count);
         ByteArrayInputStream stream = new ByteArrayInputStream(buffer.array());
         DataInputStream in = new DataInputStream(stream);
         try {