Fix san type parsing.

[gigi.git] / src / org / cacert / gigi / pages / account / CertificateIssueForm.java

diff --git a/src/org/cacert/gigi/pages/account/CertificateIssueForm.java b/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
index e6a071e03f9c8a0630f3f0534ecd9b40cf271896..6e7592539f85a09ed34ac64454f21e29c075ef24 100644 (file)
--- a/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
+++ b/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
@@ -285,11 +285,16 @@ public class CertificateIssueForm extends Form {
         TreeSet<SubjectAlternateName> parsedNames = new TreeSet<>();
         for (String SANline : SANparts) {
             String[] parts = SANline.split(":", 2);
-            SANType t = Certificate.SANType.valueOf(parts[0].toUpperCase());
-            if (t == null || parts.length == 1) {
+            try {
+                SANType t = Certificate.SANType.valueOf(parts[0].toUpperCase());
+                if (t == null || parts.length == 1) {
+                    continue;
+                }
+                parsedNames.add(new SubjectAlternateName(t, parts[1]));
+            } catch (IllegalArgumentException e) {
+                // invalid enum type
                 continue;
             }
-            parsedNames.add(new SubjectAlternateName(t, parts[1]));
         }
         return parsedNames;
     }