changeset 10640:d3cfac8ed6ed

8055045: StringIndexOutOfBoundsException while reading krb5.conf Reviewed-by: mullan
author igerasim
date Mon, 26 Jan 2015 14:29:54 +0300
parents 7e4bf1e7a2fe
children 4cc9179f6fce
files src/share/classes/sun/security/krb5/Config.java test/sun/security/krb5/ParseConfig.java test/sun/security/krb5/krb5.conf
diffstat 3 files changed, 18 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/security/krb5/Config.java	Thu Apr 09 13:40:54 2015 -0700
+++ b/src/share/classes/sun/security/krb5/Config.java	Mon Jan 26 14:29:54 2015 +0300
@@ -763,9 +763,9 @@
 
     private static String trimmed(String s) {
         s = s.trim();
-        if (s.isEmpty()) return s;
-        if (s.charAt(0) == '"' && s.charAt(s.length()-1) == '"' ||
-                s.charAt(0) == '\'' && s.charAt(s.length()-1) == '\'') {
+        if (s.length() >= 2 &&
+                ((s.charAt(0) == '"' && s.charAt(s.length()-1) == '"') ||
+                 (s.charAt(0) == '\'' && s.charAt(s.length()-1) == '\''))) {
             s = s.substring(1, s.length()-1).trim();
         }
         return s;
--- a/test/sun/security/krb5/ParseConfig.java	Thu Apr 09 13:40:54 2015 -0700
+++ b/test/sun/security/krb5/ParseConfig.java	Mon Jan 26 14:29:54 2015 +0300
@@ -22,7 +22,7 @@
  */
 /*
  * @test
- * @bug 6319046
+ * @bug 6319046 8055045
  * @compile -XDignore.symbol.file ParseConfig.java
  * @run main/othervm ParseConfig
  * @summary Problem with parsing krb5.conf
@@ -32,7 +32,8 @@
 
 public class ParseConfig {
     public static void main(String[] args) throws Exception {
-        System.setProperty("java.security.krb5.conf", System.getProperty("test.src", ".") +"/krb5.conf");
+        System.setProperty("java.security.krb5.conf",
+                System.getProperty("test.src", ".") + "/krb5.conf");
         Config config = Config.getInstance();
         config.listTable();
 
@@ -44,5 +45,11 @@
                         expected + "\"");
             }
         }
+
+        // JDK-8055045: IOOBE when reading an empty value
+        config.get("empty1", "NOVAL.COM");
+        config.get("empty2", "NOVAL.COM");
+        config.get("quote1", "NOVAL.COM");
+        config.get("quote2", "NOVAL.COM");
     }
 }
--- a/test/sun/security/krb5/krb5.conf	Thu Apr 09 13:40:54 2015 -0700
+++ b/test/sun/security/krb5/krb5.conf	Mon Jan 26 14:29:54 2015 +0300
@@ -27,3 +27,9 @@
 	}
    }
 
+   NOVAL.COM = {
+        empty1 =
+        empty2 =.
+        quote1 = "
+        quote2 = '
+   }