# HG changeset patch # User arajkumar # Date 1562778853 -19800 # Wed Jul 10 22:44:13 2019 +0530 # Node ID 19742573b38e07225171e61a35e3407d9cabfdf7 # Parent 6e9f042b4bbf8fc574eedb9284347ec34674ecf3 8227402: Improve XSLT processing Reviewed-by: kcr, rhalade 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 --- 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 @@ 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 @@ 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 --- 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 @@ 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 --- 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 @@ */ 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 --- 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 @@ 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); } }