Validate parser parameter to XML_SetHashSalt

diff --git a/expat/lib/expat.h b/expat/lib/expat.h
index da7f706eb9e6fc4454b543336c43b21250f525c2..2a06f35e3b7c345697476446ddd3726331392551 100644 (file)
--- a/expat/lib/expat.h
+++ b/expat/lib/expat.h
@@ -915,6 +915,7 @@ XML_SetParamEntityParsing(XML_Parser parser,
    Helps in preventing DoS attacks based on predicting hash
    function behavior. This must be called before parsing is started.
    Returns 1 if successful, 0 when called after parsing has started.
+   Note: If parser == NULL, the function will do nothing and return 0.
 */
 XMLPARSEAPI(int)
 XML_SetHashSalt(XML_Parser parser,

diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index 135791e644aca36811ed7f1a84002172516717ca..dfdb509bc9ee4bc7950becfaffa6ca4bc3d3b2ad 100644 (file)
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -1635,6 +1635,8 @@ int XMLCALL
 XML_SetHashSalt(XML_Parser parser,
                 unsigned long hash_salt)
 {
+  if (parser == NULL)
+    return 0;
   /* block after XML_Parse()/XML_ParseBuffer() has been called */
   if (ps_parsing == XML_PARSING || ps_parsing == XML_SUSPENDED)
     return 0;