[bugfix] Make sure the format of the value of a decimal-format property is correct

Author: adamretter

exist-core/src/main/antlr/org/exist/xquery/parser/XQueryTree.g

@@ -567,7 +567,12 @@ throws PermissionDeniedException, EXistException, XPathException
                       current = (XQueryAST) pval.getNextSibling();
                   }
 
-                  final DecimalFormat df = DecimalFormat.fromProperties(dfProperties);
+                  final DecimalFormat df;
+                  try {
+                      df = DecimalFormat.fromProperties(dfProperties);
+                  } catch (final IllegalArgumentException ex) {
+                      throw new XPathException(dfName.getLine(), dfName.getColumn(), ErrorCodes.W3CErrorCode.XQST0097.getErrorCode(), ex.getMessage() + " within the picture string of the decimal format: " + dfName.getText() + ".");
+                  }
                   if (!df.checkDistinctCharacters()) {
                       throw new XPathException(dfName.getLine(), dfName.getColumn(), ErrorCodes.W3CErrorCode.XQST0098.getErrorCode(), "Characters within the picture string of the decimal format: " + dfName.getText() + " are not distinct.");
                   }

exist-core/src/main/java/org/exist/xquery/DecimalFormat.java

@@ -136,7 +136,16 @@ public boolean checkDistinctCharacters() {
         return true;
     }
 
-    public static DecimalFormat fromProperties(final Map<String, String> properties) {
+    /**
+     * Constructs a Decimal Format from a map of decimal format properties.
+     *
+     * @param properties the properties for the decimal format.
+     *
+     * @return the Decimal Format.
+     *
+     * @throws IllegalArgumentException if any of the properties are invalid.
+     */
+    public static DecimalFormat fromProperties(final Map<String, String> properties) throws IllegalArgumentException {
         int decimalSeparator = UNNAMED.decimalSeparator;
         int exponentSeparator = UNNAMED.exponentSeparator;
         int groupingSeparator = UNNAMED.groupingSeparator;
@@ -153,36 +162,73 @@ public static DecimalFormat fromProperties(final Map<String, String> properties)
             final String value = property.getValue();
             switch (property.getKey()) {
                 case "decimal-separator":
+                    if (value.length() != 1) {
+                        throw new IllegalArgumentException("decimal-separator must be a single character");
+                    }
                     decimalSeparator = value.charAt(0);
                     break;
+
                 case "exponent-separator":
+                    if (value.length() != 1) {
+                        throw new IllegalArgumentException("exponent-separator must be a single character");
+                    }
                     exponentSeparator = value.charAt(0);
                     break;
+
                 case "grouping-separator":
+                    if (value.length() != 1) {
+                        throw new IllegalArgumentException("groupung-separator must be a single character");
+                    }
                     groupingSeparator = value.charAt(0);
                     break;
+
                 case "percent":
+                    if (value.length() != 1) {
+                        throw new IllegalArgumentException("percent must be a single character");
+                    }
                     percent = value.charAt(0);
                     break;
+
                 case "per-mille":
+                    if (value.length() != 1) {
+                        throw new IllegalArgumentException("per-mille must be a single character");
+                    }
                     perMille = value.charAt(0);
                     break;
+
                 case "zero-digit":
+                    if (value.length() != 1) {
+                        throw new IllegalArgumentException("zero-digit must be a single character");
+                    }
                     zeroDigit = value.charAt(0);
                     break;
+
                 case "digit":
+                    if (value.length() != 1) {
+                        throw new IllegalArgumentException("digit must be a single character");
+                    }
                     digit = value.charAt(0);
                     break;
+
                 case "pattern-separator":
+                    if (value.length() != 1) {
+                        throw new IllegalArgumentException("pattern-separator must be a single character");
+                    }
                     patternSeparator = value.charAt(0);
                     break;
+
                 case "infinity":
                     infinity = value;
                     break;
+
                 case "NaN":
                     NaN = value;
                     break;
+
                 case "minus-sign":
+                    if (value.length() != 1) {
+                        throw new IllegalArgumentException("minus-sign must be a single character");
+                    }
                     minusSign = value.charAt(0);
                     break;
             }

exist-core/src/main/java/org/exist/xquery/ErrorCodes.java

@@ -220,6 +220,7 @@ public enum W3CErrorCode implements IErrorCode {
         XQDY0092 ("An implementation MAY raise a dynamic error  if a constructed attribute named xml:space has a value other than preserve or default."),
         XQST0093 ("It is a static error to import a module M1 if there exists a sequence of modules M1 ... Mi ... M1 such that each module directly depends on the next module in the sequence (informally, if M1 depends on itself through some chain of module dependencies.)"),
         XQST0094 ("The name of each grouping variable must be equal (by the eq operator on expanded QNames) to the name of a variable in the input tuple stream."),
+        XQST0097 ("It is a static error for a decimal-format to specify a value that is not valid for a given property, as described in statically known decimal formats"),
         XQST0098 ("It is a static error if, for any named or unnamed decimal format, the properties representing characters used in a picture string do not each have distinct values. The following properties represent characters used in a picture string: decimal-separator, exponent-separator, grouping-separator, percent, per-mille, the family of ten decimal digits starting with zero-digit, digit, and pattern-separator."),
         XQDY0101 ("An error is raised if a computed namespace constructor attempts to do any of the following: Bind the prefix xml to some namespace URI other than http://www.w3.org/XML/1998/namespace. Bind a prefix other than xml to the namespace URI http://www.w3.org/XML/1998/namespace. Bind the prefix xmlns to any namespace URI. Bind a prefix to the namespace URI http://www.w3.org/2000/xmlns/. Bind any prefix (including the empty prefix) to a zero-length namespace URI."),
         XQDY0102 ("If the name of an element in an element constructor is in no namespace, creating a default namespace for that element using a computed namespace constructor is an error."),