lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-27 12:15:34 +03:00
Code Activity

xinclude: Check URI length

Browse Source 
Don't report long URIs as OOM errors.
This commit is contained in:
Nick Wellnhofer
2024-07-01 16:01:24 +02:00
parent 37f7237050
commit 16e7ecd478
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SAX2.c
View File

@@ -31,8 +31,6 @@
#include "private/parser.h" #include "private/parser.h"
#include "private/tree.h" #include "private/tree.h"
#define XML_MAX_URI_LENGTH 2000
/* /*
* xmlSAX2ErrMemory: * xmlSAX2ErrMemory:
* @ctxt: an XML validation parser context * @ctxt: an XML validation parser context

2
include/private/parser.h
View File

@@ -4,6 +4,8 @@
#include <libxml/parser.h> #include <libxml/parser.h>
#include <libxml/xmlversion.h> #include <libxml/xmlversion.h>
#define XML_MAX_URI_LENGTH 2000
/** /**
* XML_VCTXT_DTD_VALIDATED: * XML_VCTXT_DTD_VALIDATED:
* *

13
xinclude.c
View File

@@ -418,6 +418,10 @@ xmlXIncludeAddNode(xmlXIncludeCtxtPtr ctxt, xmlNodePtr cur) {
xmlXIncludeErrMemory(ctxt); xmlXIncludeErrMemory(ctxt);
goto error; goto error;
} }
} else if (xmlStrlen(href) > XML_MAX_URI_LENGTH) {
xmlXIncludeErr(ctxt, cur, XML_XINCLUDE_HREF_URI, "URI too long\n",
NULL);
goto error;
} }
parse = xmlXIncludeGetProp(ctxt, cur, XINCLUDE_PARSE); parse = xmlXIncludeGetProp(ctxt, cur, XINCLUDE_PARSE);
@@ -634,7 +638,14 @@ xmlXIncludeBaseFixup(xmlXIncludeCtxtPtr ctxt, xmlNodePtr cur, xmlNodePtr copy,
xmlXIncludeErrMemory(ctxt); xmlXIncludeErrMemory(ctxt);
if ((base != NULL) && !xmlStrEqual(base, targetBase)) { if ((base != NULL) && !xmlStrEqual(base, targetBase)) {
if (xmlBuildRelativeURISafe(base, targetBase, &relBase) < 0) { if ((xmlStrlen(base) > XML_MAX_URI_LENGTH) ||
(xmlStrlen(targetBase) > XML_MAX_URI_LENGTH)) {
relBase = xmlStrdup(base);
if (relBase == NULL) {
xmlXIncludeErrMemory(ctxt);
goto done;
}
} else if (xmlBuildRelativeURISafe(base, targetBase, &relBase) < 0) {
xmlXIncludeErrMemory(ctxt); xmlXIncludeErrMemory(ctxt);
goto done; goto done;
} }