commit c85a2f902636b32a0156c6273a9fe13df07e7510
author Piotr Jastrzebski <haaawk@google.com> Thu Apr 02 14:37:08 2015 +0100
committer Narayan Kamath <narayan@google.com> Wed Nov 11 11:34:46 2015 +0000
tree 252bd71c12966633f114274cc38c4ea7ab9a88d9
parent 1c26ebcf7105a57e0ac1d8a6a3590255c1b8f4bd

Fix X500Name.countQuotes

Change-Id: Ief04f671fc5586b2e686c8df81841d5c0ece0538

ojluni/src/main/java/sun/security/x509/X500Name.java

diff --git a/ojluni/src/main/java/sun/security/x509/X500Name.java b/ojluni/src/main/java/sun/security/x509/X500Name.java
index 57af558..5202713 100755
--- a/ojluni/src/main/java/sun/security/x509/X500Name.java
+++ b/ojluni/src/main/java/sun/security/x509/X500Name.java
@@ -1002,11 +1002,12 @@
     static int countQuotes(String string, int from, int to) {
         int count = 0;
 
+        int escape = 0;
         for (int i = from; i < to; i++) {
-            if ((string.charAt(i) == '"' && i == from) ||
-                (string.charAt(i) == '"' && string.charAt(i-1) != '\\')) {
+            if (string.charAt(i) == '"' && escape % 2 == 0) {
                 count++;
             }
+            escape = (string.charAt(i) == '\\') ? escape + 1 : 0;
         }
 
         return count;