8227402: Improve XSLT processing

Reviewed-by: kcr, rhalade
openjdk · Jul 10, 2019 · 35e0cae · 35e0cae
1 parent 141cf7e
commit 35e0cae
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 20 deletions.
diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/documents.c b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/documents.c
@@ -296,10 +296,11 @@ xsltLoadDocument(xsltTransformContextPtr ctxt, const xmlChar *URI) {
     int res;
 
     res = xsltCheckRead(ctxt->sec, ctxt, URI);
-    if (res == 0) {
-        xsltTransformError(ctxt, NULL, NULL,
-         "xsltLoadDocument: read rights for %s denied\n",
-                 URI);
+    if (res <= 0) {
+            if (res == 0)
+                xsltTransformError(ctxt, NULL, NULL,
+                     "xsltLoadDocument: read rights for %s denied\n",
+                                 URI);
         return(NULL);
     }
     }
@@ -372,10 +373,11 @@ xsltLoadStyleDocument(xsltStylesheetPtr style, const xmlChar *URI) {
     int res;
 
     res = xsltCheckRead(sec, NULL, URI);
-    if (res == 0) {
-        xsltTransformError(NULL, NULL, NULL,
-         "xsltLoadStyleDocument: read rights for %s denied\n",
-                 URI);
+    if (res <= 0) {
+            if (res == 0)
+                xsltTransformError(NULL, NULL, NULL,
+                     "xsltLoadStyleDocument: read rights for %s denied\n",
+                                 URI);
         return(NULL);
     }
     }

diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/imports.c b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/imports.c
@@ -130,10 +130,11 @@ xsltParseStylesheetImport(xsltStylesheetPtr style, xmlNodePtr cur) {
     int secres;
 
     secres = xsltCheckRead(sec, NULL, URI);
-    if (secres == 0) {
-        xsltTransformError(NULL, NULL, NULL,
-         "xsl:import: read rights for %s denied\n",
-                 URI);
+    if (secres <= 0) {
+            if (secres == 0)
+                xsltTransformError(NULL, NULL, NULL,
+                     "xsl:import: read rights for %s denied\n",
+                                 URI);
         goto error;
     }
     }

diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/transform.c b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/transform.c
@@ -3493,10 +3493,11 @@ xsltDocumentElem(xsltTransformContextPtr ctxt, xmlNodePtr node,
      */
     if (ctxt->sec != NULL) {
     ret = xsltCheckWrite(ctxt->sec, ctxt, filename);
-    if (ret == 0) {
-        xsltTransformError(ctxt, NULL, inst,
-         "xsltDocumentElem: write rights for %s denied\n",
-                 filename);
+    if (ret <= 0) {
+            if (ret == 0)
+                xsltTransformError(ctxt, NULL, inst,
+                     "xsltDocumentElem: write rights for %s denied\n",
+                                 filename);
         xmlFree(URL);
         xmlFree(filename);
         return;

diff --git a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xslt.c b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xslt.c
@@ -6763,10 +6763,11 @@ xsltParseStylesheetFile(const xmlChar* filename) {
     int res;
 
     res = xsltCheckRead(sec, NULL, filename);
-    if (res == 0) {
-        xsltTransformError(NULL, NULL, NULL,
-         "xsltParseStylesheetFile: read rights for %s denied\n",
-                 filename);
+    if (res <= 0) {
+            if (res == 0)
+                xsltTransformError(NULL, NULL, NULL,
+                     "xsltParseStylesheetFile: read rights for %s denied\n",
+                                 filename);
         return(NULL);
     }
     }