--- old/src/java.naming/share/classes/com/sun/jndi/ldap/BerDecoder.java	2018-10-26 07:49:34.016951560 -0700
+++ new/src/java.naming/share/classes/com/sun/jndi/ldap/BerDecoder.java	2018-10-26 07:49:33.591911314 -0700
@@ -186,12 +186,16 @@
       *</pre></blockquote>
       */
     private int parseIntWithTag(int tag) throws DecodeException {
-
-
         if (parseByte() != tag) {
+            // Ber could have been reset;
+            String s;
+            if (offset > 0) {
+                s = Integer.toString(buf[offset - 1] & 0xff);
+            } else {
+                s = "Empty tag";
+            }
             throw new DecodeException("Encountered ASN.1 tag " +
-                Integer.toString(buf[offset - 1] & 0xff) +
-                " (expected tag " + Integer.toString(tag) + ")");
+                s + " (expected tag " + Integer.toString(tag) + ")");
         }
 
         int len = parseLength();