c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

memory: Deprecate xmlGcMemSetup

Browse Source
This commit is contained in:
Nick Wellnhofer 2024-07-16 00:35:53 +02:00
parent ff39f28bd7
commit 5d36664fc9
16 changed files with 47 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
HTMLparser.c
View File

@ -2636,7 +2636,7 @@ htmlParseHTMLAttribute(htmlParserCtxtPtr ctxt, const xmlChar stop) {
* allocate a translation buffer. * allocate a translation buffer.
*/ */
buffer_size = HTML_PARSER_BUFFER_SIZE; buffer_size = HTML_PARSER_BUFFER_SIZE;
buffer = (xmlChar *) xmlMallocAtomic(buffer_size); buffer = xmlMalloc(buffer_size);
if (buffer == NULL) { if (buffer == NULL) {
htmlErrMemory(ctxt); htmlErrMemory(ctxt);
return(NULL); return(NULL);
@ -3272,7 +3272,7 @@ htmlParsePI(htmlParserCtxtPtr ctxt) {
target, NULL); target, NULL);
goto done; goto done;
} }
buf = (xmlChar *) xmlMallocAtomic(size); buf = xmlMalloc(size);
if (buf == NULL) { if (buf == NULL) {
htmlErrMemory(ctxt); htmlErrMemory(ctxt);
return; return;
@ -3368,7 +3368,7 @@ htmlParseComment(htmlParserCtxtPtr ctxt) {
state = ctxt->instate; state = ctxt->instate;
ctxt->instate = XML_PARSER_COMMENT; ctxt->instate = XML_PARSER_COMMENT;
SKIP(4); SKIP(4);
buf = (xmlChar *) xmlMallocAtomic(size); buf = xmlMalloc(size);
if (buf == NULL) { if (buf == NULL) {
htmlErrMemory(ctxt); htmlErrMemory(ctxt);
return; return;

2
c14n.c
View File

@ -2133,7 +2133,7 @@ xmlC11NNormalizeString(const xmlChar * input,
* allocate an translation buffer. * allocate an translation buffer.
*/ */
buffer_size = 1000; buffer_size = 1000;
buffer = (xmlChar *) xmlMallocAtomic(buffer_size); buffer = xmlMalloc(buffer_size);
if (buffer == NULL) if (buffer == NULL)
return (NULL); return (NULL);
out = buffer; out = buffer;

4
catalog.c
View File

@ -967,7 +967,7 @@ xmlLoadFileContent(const char *filename)
return (NULL); return (NULL);
} }
size = info.st_size; size = info.st_size;
content = (xmlChar*)xmlMallocAtomic(size + 10); content = xmlMalloc(size + 10);
if (content == NULL) { if (content == NULL) {
xmlCatalogErrMemory(); xmlCatalogErrMemory();
close(fd); close(fd);
@ -2158,7 +2158,7 @@ xmlParseSGMLCatalogPubid(const xmlChar *cur, xmlChar **id) {
} else { } else {
stop = ' '; stop = ' ';
} }
buf = (xmlChar *) xmlMallocAtomic(size); buf = xmlMalloc(size);
if (buf == NULL) { if (buf == NULL) {
xmlCatalogErrMemory(); xmlCatalogErrMemory();
return(NULL); return(NULL);

2
include/libxml/xmlmemory.h
View File

@ -112,12 +112,14 @@ XMLPUBFUN int
xmlMallocFunc *mallocFunc, xmlMallocFunc *mallocFunc,
xmlReallocFunc *reallocFunc, xmlReallocFunc *reallocFunc,
xmlStrdupFunc *strdupFunc); xmlStrdupFunc *strdupFunc);
XML_DEPRECATED
XMLPUBFUN int XMLPUBFUN int
xmlGcMemSetup (xmlFreeFunc freeFunc, xmlGcMemSetup (xmlFreeFunc freeFunc,
xmlMallocFunc mallocFunc, xmlMallocFunc mallocFunc,
xmlMallocFunc mallocAtomicFunc, xmlMallocFunc mallocAtomicFunc,
xmlReallocFunc reallocFunc, xmlReallocFunc reallocFunc,
xmlStrdupFunc strdupFunc); xmlStrdupFunc strdupFunc);
XML_DEPRECATED
XMLPUBFUN int XMLPUBFUN int
xmlGcMemGet (xmlFreeFunc *freeFunc, xmlGcMemGet (xmlFreeFunc *freeFunc,
xmlMallocFunc *mallocFunc, xmlMallocFunc *mallocFunc,

4
nanohttp.c
View File

@ -500,7 +500,7 @@ xmlNanoHTTPRecv(xmlNanoHTTPCtxtPtr ctxt)
while (ctxt->state & XML_NANO_HTTP_READ) { while (ctxt->state & XML_NANO_HTTP_READ) {
if (ctxt->in == NULL) { if (ctxt->in == NULL) {
ctxt->in = (char *) xmlMallocAtomic(65000); ctxt->in = xmlMalloc(65000);
if (ctxt->in == NULL) { if (ctxt->in == NULL) {
xmlHTTPErrMemory(); xmlHTTPErrMemory();
ctxt->last = -1; ctxt->last = -1;
@ -1441,7 +1441,7 @@ retry:
else else
blen += 11; blen += 11;
} }
bp = (char*)xmlMallocAtomic(blen); bp = xmlMalloc(blen);
if ( bp == NULL ) { if ( bp == NULL ) {
xmlNanoHTTPFreeCtxt( ctxt ); xmlNanoHTTPFreeCtxt( ctxt );
xmlHTTPErrMemory(); xmlHTTPErrMemory();

24
parser.c
View File

@ -3014,7 +3014,7 @@ xmlSplitQName(xmlParserCtxtPtr ctxt, const xmlChar *name, xmlChar **prefixOut) {
*/ */
max = len * 2; max = len * 2;
buffer = (xmlChar *) xmlMallocAtomic(max); buffer = xmlMalloc(max);
if (buffer == NULL) { if (buffer == NULL) {
xmlErrMemory(ctxt); xmlErrMemory(ctxt);
return(NULL); return(NULL);
@ -3101,7 +3101,7 @@ xmlSplitQName(xmlParserCtxtPtr ctxt, const xmlChar *name, xmlChar **prefixOut) {
*/ */
max = len * 2; max = len * 2;
buffer = (xmlChar *) xmlMallocAtomic(max); buffer = xmlMalloc(max);
if (buffer == NULL) { if (buffer == NULL) {
xmlErrMemory(ctxt); xmlErrMemory(ctxt);
xmlFree(prefix); xmlFree(prefix);
@ -3598,7 +3598,7 @@ xmlParseStringName(xmlParserCtxtPtr ctxt, const xmlChar** str) {
xmlChar *buffer; xmlChar *buffer;
int max = len * 2; int max = len * 2;
buffer = (xmlChar *) xmlMallocAtomic(max); buffer = xmlMalloc(max);
if (buffer == NULL) { if (buffer == NULL) {
xmlErrMemory(ctxt); xmlErrMemory(ctxt);
return(NULL); return(NULL);
@ -3681,7 +3681,7 @@ xmlParseNmtoken(xmlParserCtxtPtr ctxt) {
xmlChar *buffer; xmlChar *buffer;
int max = len * 2; int max = len * 2;
buffer = (xmlChar *) xmlMallocAtomic(max); buffer = xmlMalloc(max);
if (buffer == NULL) { if (buffer == NULL) {
xmlErrMemory(ctxt); xmlErrMemory(ctxt);
return(NULL); return(NULL);
@ -4600,7 +4600,7 @@ xmlParseSystemLiteral(xmlParserCtxtPtr ctxt) {
return(NULL); return(NULL);
} }
buf = (xmlChar *) xmlMallocAtomic(size); buf = xmlMalloc(size);
if (buf == NULL) { if (buf == NULL) {
xmlErrMemory(ctxt); xmlErrMemory(ctxt);
return(NULL); return(NULL);
@ -4671,7 +4671,7 @@ xmlParsePubidLiteral(xmlParserCtxtPtr ctxt) {
xmlFatalErr(ctxt, XML_ERR_LITERAL_NOT_STARTED, NULL); xmlFatalErr(ctxt, XML_ERR_LITERAL_NOT_STARTED, NULL);
return(NULL); return(NULL);
} }
buf = (xmlChar *) xmlMallocAtomic(size); buf = xmlMalloc(size);
if (buf == NULL) { if (buf == NULL) {
xmlErrMemory(ctxt); xmlErrMemory(ctxt);
return(NULL); return(NULL);
@ -5109,7 +5109,7 @@ xmlParseCommentComplex(xmlParserCtxtPtr ctxt, xmlChar *buf,
if (buf == NULL) { if (buf == NULL) {
len = 0; len = 0;
size = XML_PARSER_BUFFER_SIZE; size = XML_PARSER_BUFFER_SIZE;
buf = (xmlChar *) xmlMallocAtomic(size); buf = xmlMalloc(size);
if (buf == NULL) { if (buf == NULL) {
xmlErrMemory(ctxt); xmlErrMemory(ctxt);
return; return;
@ -5273,7 +5273,7 @@ get_more:
size = nbchar + 1; size = nbchar + 1;
else else
size = XML_PARSER_BUFFER_SIZE + nbchar; size = XML_PARSER_BUFFER_SIZE + nbchar;
buf = (xmlChar *) xmlMallocAtomic(size); buf = xmlMalloc(size);
if (buf == NULL) { if (buf == NULL) {
xmlErrMemory(ctxt); xmlErrMemory(ctxt);
return; return;
@ -5517,7 +5517,7 @@ xmlParsePI(xmlParserCtxtPtr ctxt) {
target, NULL); target, NULL);
return; return;
} }
buf = (xmlChar *) xmlMallocAtomic(size); buf = xmlMalloc(size);
if (buf == NULL) { if (buf == NULL) {
xmlErrMemory(ctxt); xmlErrMemory(ctxt);
return; return;
@ -9614,7 +9614,7 @@ xmlParseCDSect(xmlParserCtxtPtr ctxt) {
} }
NEXTL(sl); NEXTL(sl);
cur = xmlCurrentCharRecover(ctxt, &l); cur = xmlCurrentCharRecover(ctxt, &l);
buf = (xmlChar *) xmlMallocAtomic(size); buf = xmlMalloc(size);
if (buf == NULL) { if (buf == NULL) {
xmlErrMemory(ctxt); xmlErrMemory(ctxt);
goto out; goto out;
@ -10019,7 +10019,7 @@ xmlParseVersionNum(xmlParserCtxtPtr ctxt) {
int size = 10; int size = 10;
xmlChar cur; xmlChar cur;
buf = (xmlChar *) xmlMallocAtomic(size); buf = xmlMalloc(size);
if (buf == NULL) { if (buf == NULL) {
xmlErrMemory(ctxt); xmlErrMemory(ctxt);
return(NULL); return(NULL);
@ -10134,7 +10134,7 @@ xmlParseEncName(xmlParserCtxtPtr ctxt) {
cur = CUR; cur = CUR;
if (((cur >= 'a') && (cur <= 'z')) || if (((cur >= 'a') && (cur <= 'z')) ||
((cur >= 'A') && (cur <= 'Z'))) { ((cur >= 'A') && (cur <= 'Z'))) {
buf = (xmlChar *) xmlMallocAtomic(size); buf = xmlMalloc(size);
if (buf == NULL) { if (buf == NULL) {
xmlErrMemory(ctxt); xmlErrMemory(ctxt);
return(NULL); return(NULL);

2
relaxng.c
View File

@ -8426,7 +8426,7 @@ xmlRelaxNGNormalize(xmlRelaxNGValidCtxtPtr ctxt, const xmlChar * str)
tmp++; tmp++;
len = tmp - str; len = tmp - str;
ret = (xmlChar *) xmlMallocAtomic(len + 1); ret = xmlMalloc(len + 1);
if (ret == NULL) { if (ret == NULL) {
xmlRngVErrMemory(ctxt); xmlRngVErrMemory(ctxt);
return (NULL); return (NULL);

6
tree.c
View File

@ -186,7 +186,7 @@ xmlBuildQName(const xmlChar *ncname, const xmlChar *prefix,
lenp = strlen((char *) prefix); lenp = strlen((char *) prefix);
if ((memory == NULL) || (len < lenn + lenp + 2)) { if ((memory == NULL) || (len < lenn + lenp + 2)) {
ret = (xmlChar *) xmlMallocAtomic(lenn + lenp + 2); ret = xmlMalloc(lenn + lenp + 2);
if (ret == NULL) if (ret == NULL)
return(NULL); return(NULL);
} else { } else {
@ -4736,10 +4736,10 @@ xmlGetNodePath(const xmlNode *node)
return (NULL); return (NULL);
buf_len = 500; buf_len = 500;
buffer = (xmlChar *) xmlMallocAtomic(buf_len); buffer = xmlMalloc(buf_len);
if (buffer == NULL) if (buffer == NULL)
return (NULL); return (NULL);
buf = (xmlChar *) xmlMallocAtomic(buf_len); buf = xmlMalloc(buf_len);
if (buf == NULL) { if (buf == NULL) {
xmlFree(buffer); xmlFree(buffer);
return (NULL); return (NULL);

8
uri.c
View File

@ -1132,7 +1132,7 @@ xmlSaveUri(xmlURIPtr uri) {
max = 80; max = 80;
ret = (xmlChar *) xmlMallocAtomic(max + 1); ret = xmlMalloc(max + 1);
if (ret == NULL) if (ret == NULL)
return(NULL); return(NULL);
len = 0; len = 0;
@ -1625,7 +1625,7 @@ xmlURIUnescapeString(const char *str, int len, char *target) {
if (len < 0) return(NULL); if (len < 0) return(NULL);
if (target == NULL) { if (target == NULL) {
ret = (char *) xmlMallocAtomic(len + 1); ret = xmlMalloc(len + 1);
if (ret == NULL) if (ret == NULL)
return(NULL); return(NULL);
} else } else
@ -1687,7 +1687,7 @@ xmlURIEscapeStr(const xmlChar *str, const xmlChar *list) {
len = xmlStrlen(str); len = xmlStrlen(str);
len += 20; len += 20;
ret = (xmlChar *) xmlMallocAtomic(len); ret = xmlMalloc(len);
if (ret == NULL) if (ret == NULL)
return(NULL); return(NULL);
in = (const xmlChar *) str; in = (const xmlChar *) str;
@ -2270,7 +2270,7 @@ xmlBuildURISafe(const xmlChar *URI, const xmlChar *base, xmlChar **valPtr) {
len += strlen(ref->path); len += strlen(ref->path);
if (bas->path != NULL) if (bas->path != NULL)
len += strlen(bas->path); len += strlen(bas->path);
res->path = (char *) xmlMallocAtomic(len); res->path = xmlMalloc(len);
if (res->path == NULL) if (res->path == NULL)
goto done; goto done;
res->path[0] = 0; res->path[0] = 0;

4
xmlmemory.c
View File

@ -497,6 +497,8 @@ xmlMemGet(xmlFreeFunc *freeFunc, xmlMallocFunc *mallocFunc,
* @reallocFunc: the realloc() function to use * @reallocFunc: the realloc() function to use
* @strdupFunc: the strdup() function to use * @strdupFunc: the strdup() function to use
* *
* DEPRECATED: Use xmlMemSetup.
*
* Override the default memory access functions with a new set * Override the default memory access functions with a new set
* This has to be called before any other libxml routines ! * This has to be called before any other libxml routines !
* The mallocAtomicFunc is specialized for atomic block * The mallocAtomicFunc is specialized for atomic block
@ -537,6 +539,8 @@ xmlGcMemSetup(xmlFreeFunc freeFunc, xmlMallocFunc mallocFunc,
* @reallocFunc: place to save the realloc() function in use * @reallocFunc: place to save the realloc() function in use
* @strdupFunc: place to save the strdup() function in use * @strdupFunc: place to save the strdup() function in use
* *
* DEPRECATED: xmlMemGet.
*
* Provides the memory access functions set currently in use * Provides the memory access functions set currently in use
* The mallocAtomicFunc is specialized for atomic block * The mallocAtomicFunc is specialized for atomic block
* allocations (i.e. of areas useful for garbage collected memory allocators * allocations (i.e. of areas useful for garbage collected memory allocators

10
xmlregexp.c
View File

@ -4029,7 +4029,7 @@ xmlRegExecPushString2(xmlRegExecCtxtPtr exec, const xmlChar *value,
lenp = strlen((char *) value); lenp = strlen((char *) value);
if (150 < lenn + lenp + 2) { if (150 < lenn + lenp + 2) {
str = (xmlChar *) xmlMallocAtomic(lenn + lenp + 2); str = xmlMalloc(lenn + lenp + 2);
if (str == NULL) { if (str == NULL) {
exec->status = XML_REGEXP_OUT_OF_MEMORY; exec->status = XML_REGEXP_OUT_OF_MEMORY;
return(-1); return(-1);
@ -5569,7 +5569,7 @@ xmlAutomataNewTransition2(xmlAutomataPtr am, xmlAutomataStatePtr from,
lenn = strlen((char *) token2); lenn = strlen((char *) token2);
lenp = strlen((char *) token); lenp = strlen((char *) token);
str = (xmlChar *) xmlMallocAtomic(lenn + lenp + 2); str = xmlMalloc(lenn + lenp + 2);
if (str == NULL) { if (str == NULL) {
xmlRegFreeAtom(atom); xmlRegFreeAtom(atom);
return(NULL); return(NULL);
@ -5631,7 +5631,7 @@ xmlAutomataNewNegTrans(xmlAutomataPtr am, xmlAutomataStatePtr from,
lenn = strlen((char *) token2); lenn = strlen((char *) token2);
lenp = strlen((char *) token); lenp = strlen((char *) token);
str = (xmlChar *) xmlMallocAtomic(lenn + lenp + 2); str = xmlMalloc(lenn + lenp + 2);
if (str == NULL) { if (str == NULL) {
xmlRegFreeAtom(atom); xmlRegFreeAtom(atom);
return(NULL); return(NULL);
@ -5703,7 +5703,7 @@ xmlAutomataNewCountTrans2(xmlAutomataPtr am, xmlAutomataStatePtr from,
lenn = strlen((char *) token2); lenn = strlen((char *) token2);
lenp = strlen((char *) token); lenp = strlen((char *) token);
str = (xmlChar *) xmlMallocAtomic(lenn + lenp + 2); str = xmlMalloc(lenn + lenp + 2);
if (str == NULL) if (str == NULL)
goto error; goto error;
memcpy(&str[0], token, lenp); memcpy(&str[0], token, lenp);
@ -5876,7 +5876,7 @@ xmlAutomataNewOnceTrans2(xmlAutomataPtr am, xmlAutomataStatePtr from,
lenn = strlen((char *) token2); lenn = strlen((char *) token2);
lenp = strlen((char *) token); lenp = strlen((char *) token);
str = (xmlChar *) xmlMallocAtomic(lenn + lenp + 2); str = xmlMalloc(lenn + lenp + 2);
if (str == NULL) if (str == NULL)
goto error; goto error;
memcpy(&str[0], token, lenp); memcpy(&str[0], token, lenp);

2
xmlschemas.c
View File

@ -27292,7 +27292,7 @@ xmlSchemaSAXHandleStartElementNs(void *ctx,
* we are forced to work around it. * we are forced to work around it.
*/ */
valueLen = attributes[j+4] - attributes[j+3]; valueLen = attributes[j+4] - attributes[j+3];
value = xmlMallocAtomic(valueLen + 1); value = xmlMalloc(valueLen + 1);
if (value == NULL) { if (value == NULL) {
xmlSchemaVErrMemory(vctxt); xmlSchemaVErrMemory(vctxt);
goto internal_error; goto internal_error;

2
xmlschemastypes.c
View File

@ -3426,7 +3426,7 @@ xmlSchemaValAtomicType(xmlSchemaTypePtr type, const xmlChar * value,
if (v == NULL) if (v == NULL)
goto error; goto error;
base = base =
(xmlChar *) xmlMallocAtomic(i + pad + 1); xmlMalloc(i + pad + 1);
if (base == NULL) { if (base == NULL) {
xmlSchemaTypeErrMemory(); xmlSchemaTypeErrMemory();
xmlFree(v); xmlFree(v);

8
xmlstring.c
View File

@ -54,7 +54,7 @@ xmlStrndup(const xmlChar *cur, int len) {
xmlChar *ret; xmlChar *ret;
if ((cur == NULL) || (len < 0)) return(NULL); if ((cur == NULL) || (len < 0)) return(NULL);
ret = (xmlChar *) xmlMallocAtomic((size_t) len + 1); ret = xmlMalloc((size_t) len + 1);
if (ret == NULL) { if (ret == NULL) {
return(NULL); return(NULL);
} }
@ -98,7 +98,7 @@ xmlCharStrndup(const char *cur, int len) {
xmlChar *ret; xmlChar *ret;
if ((cur == NULL) || (len < 0)) return(NULL); if ((cur == NULL) || (len < 0)) return(NULL);
ret = (xmlChar *) xmlMallocAtomic((size_t) len + 1); ret = xmlMalloc((size_t) len + 1);
if (ret == NULL) { if (ret == NULL) {
return(NULL); return(NULL);
} }
@ -1022,7 +1022,7 @@ xmlUTF8Strndup(const xmlChar *utf, int len) {
if ((utf == NULL) || (len < 0)) return(NULL); if ((utf == NULL) || (len < 0)) return(NULL);
i = xmlUTF8Strsize(utf, len); i = xmlUTF8Strsize(utf, len);
ret = (xmlChar *) xmlMallocAtomic((size_t) i + 1); ret = xmlMalloc((size_t) i + 1);
if (ret == NULL) { if (ret == NULL) {
return(NULL); return(NULL);
} }
@ -1178,7 +1178,7 @@ xmlEscapeFormatString(xmlChar **msg)
if ((count > INT_MAX) || (msgLen > INT_MAX - count)) if ((count > INT_MAX) || (msgLen > INT_MAX - count))
return(NULL); return(NULL);
resultLen = msgLen + count + 1; resultLen = msgLen + count + 1;
result = (xmlChar *) xmlMallocAtomic(resultLen); result = xmlMalloc(resultLen);
if (result == NULL) { if (result == NULL) {
/* Clear *msg to prevent format string vulnerabilities in /* Clear *msg to prevent format string vulnerabilities in
out-of-memory situations. */ out-of-memory situations. */

2
xpath.c
View File

@ -8644,7 +8644,7 @@ xmlXPathParseNameComplex(xmlXPathParserContextPtr ctxt, int qualified) {
if (len > XML_MAX_NAME_LENGTH) { if (len > XML_MAX_NAME_LENGTH) {
XP_ERRORNULL(XPATH_EXPR_ERROR); XP_ERRORNULL(XPATH_EXPR_ERROR);
} }
buffer = (xmlChar *) xmlMallocAtomic(max); buffer = xmlMalloc(max);
if (buffer == NULL) { if (buffer == NULL) {
xmlXPathPErrMemory(ctxt); xmlXPathPErrMemory(ctxt);
return(NULL); return(NULL);

2
xpointer.c
View File

@ -267,7 +267,7 @@ xmlXPtrEvalXPtrPart(xmlXPathParserContextPtr ctxt, xmlChar *name) {
len = xmlStrlen(ctxt->cur); len = xmlStrlen(ctxt->cur);
len++; len++;
buffer = (xmlChar *) xmlMallocAtomic(len); buffer = xmlMalloc(len);
if (buffer == NULL) { if (buffer == NULL) {
xmlXPathPErrMemory(ctxt); xmlXPathPErrMemory(ctxt);
xmlFree(name); xmlFree(name);