# HG changeset patch
# User asaha
# Date 1423758415 28800
# Node ID 400f11ef3c1710679afb253bca8dbe22cd862fd2
# Parent  58f47ca9f9b66f438d3e373fefacae27566dc039# Parent  50fba38f3a29f55baaae2da9b392bf9abc8389c1
Merge

diff -r 58f47ca9f9b6 -r 400f11ef3c17 .hgtags
--- a/.hgtags	Wed Jan 28 21:50:31 2015 -0800
+++ b/.hgtags	Thu Feb 12 08:26:55 2015 -0800
@@ -378,10 +378,14 @@
 78d90db9de2801eec010ccb9f0db3caf969dfc3b jdk8u40-b21
 54a13451ce243f2159ed3996e6efcf374a5750ca jdk8u40-b22
 e07fbae1efeac4e50514384caa7d226af7414114 jdk8u40-b23
+048cebd17f73f23ce2295e360f31c1b6788195aa jdk8u40-b24
+4c0d4c38279c5790aa5b61b03c4cfa9b2a58bc72 jdk8u40-b25
 9286acc600a779acb8bcfab38e82d4f50704afe3 jdk8u45-b00
 9fded65e1d36e3388111955d50ebf8511dd0345e jdk8u45-b01
 62566a3dbe5982565ce3e468ee3980b7937a86cc jdk8u45-b02
 629096783c27510c656229b1adc7fb180cada9c6 jdk8u45-b03
 85585012b976b72665f8f7740526bde25ccc62e4 jdk8u45-b04
 da025bade645f0d1e0ef2f825320bd5af0c23eba jdk8u45-b05
+49bc5472ded41c77dabb0840d385cbee1d60d8e9 jdk8u45-b06
+061930bd7d8fc2f05042e7eeb32adff1759c6d62 jdk8u45-b07
 ef437e576e3654f6f9c0cc116a0a824f382b9007 jdk8u51-b00
diff -r 58f47ca9f9b6 -r 400f11ef3c17 src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java	Wed Jan 28 21:50:31 2015 -0800
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java	Thu Feb 12 08:26:55 2015 -0800
@@ -270,8 +270,8 @@
         if (Double.isNaN(start))
             return(EMPTYSTRING);
 
-            final int strlen = value.length();
-            int istart = (int)Math.round(start) - 1;
+        final int strlen = value.length();
+        int istart = (int)Math.round(start) - 1;
 
         if (istart > strlen)
             return(EMPTYSTRING);
@@ -292,10 +292,11 @@
     public static String substringF(String value, double start, double length) {
         if (Double.isInfinite(start) ||
             Double.isNaN(start) ||
-            Double.isNaN(length))
+            Double.isNaN(length) ||
+            length < 0)
             return(EMPTYSTRING);
 
-            int istart = (int)Math.round(start) - 1;
+        int istart = (int)Math.round(start) - 1;
         final int isum;
         if (Double.isInfinite(length))
             isum = Integer.MAX_VALUE;