Merge pull request #2760 from martinhsv/v2/master

XML parser cleanup: NULL duplicate pointer
owasp-modsecurity · Jun 8, 2022 · 4136c4c · 4136c4c
2 parents fc8e558 + dfbdaf8
commit 4136c4c
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/apache2/msc_xml.c b/apache2/msc_xml.c
@@ -140,6 +140,9 @@ apr_status_t xml_cleanup(modsec_rec *msr) {
     if (msr->xml->parsing_ctx != NULL) {
         if (msr->xml->parsing_ctx->myDoc) {
             xmlFreeDoc(msr->xml->parsing_ctx->myDoc);
+            if (msr->xml->parsing_ctx->myDoc == msr->xml->doc) {
+                msr->xml->doc = NULL;
+            }
         }
         xmlFreeParserCtxt(msr->xml->parsing_ctx);
         msr->xml->parsing_ctx = NULL;