xalan-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1581426 - /xalan/java/branches/xalan-j_2_7_1_maint/src/org/apache/xpath/functions/FuncSystemProperty.java
Date Tue, 25 Mar 2014 17:47:09 GMT
Author: ggregory
Date: Tue Mar 25 17:47:08 2014
New Revision: 1581426

URL: http://svn.apache.org/r1581426
Log:
Adjustment to patch for secure processing for CVE-2014-0107 by Ryan Berg based on feedack
from Emmanuel Bourg.

Modified:
    xalan/java/branches/xalan-j_2_7_1_maint/src/org/apache/xpath/functions/FuncSystemProperty.java

Modified: xalan/java/branches/xalan-j_2_7_1_maint/src/org/apache/xpath/functions/FuncSystemProperty.java
URL: http://svn.apache.org/viewvc/xalan/java/branches/xalan-j_2_7_1_maint/src/org/apache/xpath/functions/FuncSystemProperty.java?rev=1581426&r1=1581425&r2=1581426&view=diff
==============================================================================
--- xalan/java/branches/xalan-j_2_7_1_maint/src/org/apache/xpath/functions/FuncSystemProperty.java
(original)
+++ xalan/java/branches/xalan-j_2_7_1_maint/src/org/apache/xpath/functions/FuncSystemProperty.java
Tue Mar 25 17:47:08 2014
@@ -100,13 +100,12 @@ public class FuncSystemProperty extends 
             //if secure procession is enabled only handle required properties do not not
map any valid system property
             if(!xctxt.isSecureProcessing())
             {
-                result = System.getProperty(fullName);
+                result = System.getProperty(propName);
             }
             else
             {
                 warn(xctxt, XPATHErrorResources.WG_SECURITY_EXCEPTION,
                         new Object[]{ fullName });  //"SecurityException when trying to access
XSL system property: "+fullName);
-                result = xsltInfo.getProperty(propName);
             }
             if (null == result)
             {
@@ -135,7 +134,6 @@ public class FuncSystemProperty extends 
           {
               warn(xctxt, XPATHErrorResources.WG_SECURITY_EXCEPTION,
                       new Object[]{ fullName });  //"SecurityException when trying to access
XSL system property: "+fullName);
-              result = xsltInfo.getProperty(propName);
           }
           if (null == result)
           {



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org


Mime
View raw message