(xerces-c) 04/06: Omit unnecessary getenv() call if DTD is disabled programmatically

[email protected] Wed, 13 Dec 2023 08:40:36 +0000
Newsgroups gmane.text.xml.xerces-c.devel
Message-ID <[email protected]>
This is an automated email from the ASF dual-hosted git repository.

borisk pushed a commit to branch xerces-3.2
in repository https://gitbox.apache.org/repos/asf/xerces-c.git

commit 20bce7b075ee222a01546aff4dceb45d1f80d3a7
Author: Boris Kolpackov <[email protected]>
AuthorDate: Wed Dec 13 09:49:53 2023 +0200

    Omit unnecessary getenv() call if DTD is disabled programmatically
---
 src/xercesc/internal/XMLScanner.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/xercesc/internal/XMLScanner.cpp b/src/xercesc/internal/XMLScanner.cpp
index 72327e52a..36a916e58 100644
--- a/src/xercesc/internal/XMLScanner.cpp
+++ b/src/xercesc/internal/XMLScanner.cpp
@@ -1274,8 +1274,10 @@ void XMLScanner::scanProlog()
                         emitError(XMLErrs::DuplicateDocTypeDecl);
                     }
 
-                    const char* envvar = getenv("XERCES_DISABLE_DTD");
-                    if (fDisallowDTD || (envvar && !strcmp(envvar, "1"))) {
+                    const char* envvar;
+                    if (fDisallowDTD ||
+                        ((envvar = getenv("XERCES_DISABLE_DTD")) &&
+                         !strcmp(envvar, "1"))) {
                     	emitError(XMLErrs::InvalidDocumentStructure);
                     }
                     else {