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
7,222 Commits 9 Branches 228 Tags
Commit Graph

254 Commits

Author SHA1 Message Date
Nick Wellnhofer
be579a266e reader: Fix return value of xmlTextReaderReadString again 
Make sure to return NULL for node types except elements or text to match
the old behavior.

Note that CDATA sections are still treated like text nodes and will have
their content returned.

Fixes #838.
 2025-01-15 15:24:58 +01:00
Nick Wellnhofer
58e2e72481 reader: Check reallocations for overflow 2024-12-21 19:37:37 +01:00
Nick Wellnhofer
e6045ed754 reader: Add argument checks 2024-12-13 12:39:52 +01:00
Nick Wellnhofer
49164610a4 reader: Forward catastrophic errors from XInclude 2024-12-13 12:39:44 +01:00
Nick Wellnhofer
0f4f89005d parser: Rename inputPush to xmlCtxtPushInput 2024-11-19 00:25:23 +01:00
Nick Wellnhofer
9201173c5a xmlreader: Fix return value of xmlTextReaderReadString 
Return NULL if the node has no children or the children were already
deleted to match the 2.12 behavior.

Fixes #817.
 2024-11-05 11:41:28 +01:00
Nick Wellnhofer
b7c0f9d2dd string: Fix va_copy fallback 
Fix va_copy fallback reworked in 5cffba83.

Should fix #812.
 2024-10-19 14:53:25 +02:00
Nick Wellnhofer
0c56eb8215 tree: Restore return value of xmlNodeListGetString with NULL list 
When passing a NULL list to xmlNodeListGetString or
xmlNodeListGetRawString, return NULL instead of "" to match the old
behavior.

Fixes #783.
 2024-08-12 21:38:50 +02:00
Nick Wellnhofer
92f30711de parser: Optimize buffer shrinking 
Remove checks now that we can shrink memory buffers efficiently.

Shrink more aggressively.
 2024-07-16 17:42:10 +02:00
Nick Wellnhofer
a221cd7849 buf: Rework xmlBuf code 
Always use what the old implementation called the "IO" allocation
scheme, allowing to move the content pointer past the initial
allocation. This is inexpensive and allows efficient shrinking.

Optimize xmlBufGrow, reusing shrunken memory as much as possible.

Simplify xmlBufAdd.

Make xmlBufBackToBuffer return an error on overflow.

Make "size" exclude the terminating NULL byte.

Always provide an initial size.

Reintroduce static buffers.

Remove xmlBufResize and several other functions.
 2024-07-16 17:42:10 +02:00
Nick Wellnhofer
6be79014d7 Remove unused code 2024-07-15 16:33:38 +02:00
Nick Wellnhofer
440d11afd4 reader: Deprecate xmlTextReaderByteConsumed 
Document that this function is useless.

Stop trying to handle encoding via xmlByteConsumed which can be
expensive.
 2024-07-13 15:42:02 +02:00
Nick Wellnhofer
2e63656ec6 parser: Check return value of inputPush 
inputPush typically doesn't fail because we pre-allocate the input
table. The return value should be checked nevertheless.
 2024-07-08 11:27:52 +02:00
Nick Wellnhofer
f505dcaea0 tree: Remove underscores from xmlRegisterCallbacks 2024-06-27 14:45:35 +02:00
Nick Wellnhofer
57004006ae reader: Fix xmlTextReaderReadString 
Regressed in commit 7cbf609a.

Should fix #738.
 2024-06-17 15:49:03 +02:00
Nick Wellnhofer
fd7d9e5eca reader: Add callbacks for resource loader 2024-06-12 16:36:12 +02:00
Nick Wellnhofer
e75e878e02 doc: Update and fix documentation 2024-05-20 14:23:39 +02:00
Nick Wellnhofer
16fb1028a2 reader: Fix error reporting with walker 
Abort earlier in xmlTextReaderRead if an error was raised.
 2024-05-13 12:50:08 +02:00
Nick Wellnhofer
81611e06da reader: Don't call xmlCtxtErrMemory with NULL ctxt 
This can happen in "walker" mode.
 2024-05-06 00:32:08 +02:00
Nick Wellnhofer
d2f623d183 reader: Report malloc failure in xmlTextReaderConstValue 2024-04-30 16:36:44 +02:00
Nick Wellnhofer
7cbf609ae8 reader: Make xmlTextReaderReadString non-recursive 
Also report malloc failures.

Fixes #607.
 2024-04-22 12:44:12 +02:00
Nick Wellnhofer
f69647811c reader: Rework xmlTextReaderRead{Inner,Outer}Xml 
Use an xmlOutputBuffer. Report malloc failures.
 2024-04-22 12:44:12 +02:00
Nick Wellnhofer
cdb3103ba8 reader: Report malloc failures 2024-04-22 12:44:12 +02:00
Nick Wellnhofer
d2daf33e33 reader: Fix preservation of attributes 
Don't use 'curnode' which might be an attribute or namespace node
which doesn't have an 'extra' member.
 2024-04-22 12:44:12 +02:00
Nick Wellnhofer
1b4bf22c14 xmlreader: Fix memory leak in xmlTextReaderFreeProp 
Short-lived regression.
 2024-03-17 16:14:04 +01:00
Nick Wellnhofer
d0d6174e81 valid: Rework xmlAddID 2024-03-15 19:47:07 +01:00
Nick Wellnhofer
84a71860a8 xmlreader: Fix xmlTextReaderConstEncoding 
Regression from commit f1c1f5c6.

Fixes #697.
 2024-02-26 15:33:06 +01:00
Nick Wellnhofer
13962b06d5 xmlreader: Clean up error handling 
Make sure that xmlTextReaderRead returns -1 immediately if the reader is
in an error state.
 2024-02-06 12:56:56 +01:00
Nick Wellnhofer
ddda373eb5 xmlreader: Make xmlTextReaderValidateEntity return an error code 
This makes sure that xmlTextReaderRead returns -1 if a memory
allocation fails.
 2024-02-06 12:56:56 +01:00
Nick Wellnhofer
1a66b17605 [CVE-2024-25062] xmlreader: Don't expand XIncludes when backtracking 
Fixes a use-after-free if XML Reader if used with DTD validation and
XInclude expansion.

Fixes #604.
 2024-02-04 15:23:49 +01:00
Nick Wellnhofer
12f0bb9478 parser: Synchronize more options 2024-01-05 20:39:40 +01:00
Nick Wellnhofer
a5dcf0f422 parser: Mark more parser context members as unused 2023-12-29 01:20:08 +01:00
Nick Wellnhofer
955c177f69 parser: Stop using 'directory' struct member 
This was only used as a pointless fallback for URI resolution.
 2023-12-25 23:38:40 +01:00
Nick Wellnhofer
c8f1f4a280 doc: Improve documentation of error handlers 2023-12-21 17:36:17 +01:00
Nick Wellnhofer
23345a1cb1 io: Report IO errors through xmlCtxtErrIO 
This is also a new public API function to be used in external entity
loaders.
 2023-12-21 15:02:24 +01:00
Nick Wellnhofer
ed6596a47a reader: Simplify error handling 
Only use structured error handlers for parser, Schemas and RelaxNG
contexts. Also use structured error handler for XInclude context.

Remove TODO macro.
 2023-12-21 02:46:27 +01:00
Nick Wellnhofer
54c70ed57f parser: Improve error handling 
Introduce xmlCtxtSetErrorHandler allowing to set a structured error for
a parser context. There already was the "serror" SAX handler but this
always receives the parser context as argument.

Start to use xmlRaiseMemoryError.

Remove useless arguments from memory error functions. Rename
xmlErrMemory to xmlCtxtErrMemory.

Remove a few calls to xmlGenericError.

Remove support for runtime entity debugging.
 2023-12-21 02:46:27 +01:00
Nick Wellnhofer
157df34401 xmlreader: Report malloc failures 
Fix many places where malloc failures aren't reported.

Introduce a new API function xmlTextReaderGetLastError.
 2023-12-11 22:13:06 +01:00
Nick Wellnhofer
5cffba8381 Rework va_copy fallback 
va_copy is a macro, so it can be detected without a feature test.
Fallback to __va_copy or memcpy.
 2023-11-28 15:59:40 +01:00
Nick Wellnhofer
61034116d0 error: Make more xmlError structs constant 
Prepare for future changes, see 45470611.
 2023-10-24 15:02:36 +02:00
Nick Wellnhofer
81741ea4c0 xmlreader: Fix EOF detection in xmlTextReaderPushData 2023-09-21 16:29:28 +02:00
Nick Wellnhofer
4e1c13ebfd debug: Remove debugging code 
This is barely useful these days and only clutters the code base.
 2023-09-19 17:35:09 +02:00
Nick Wellnhofer
ed3bd05284 parser: Allow to set maximum amplification factor 2023-08-20 20:49:16 +02:00
Nick Wellnhofer
e2ab48b9b5 malloc-fail: Fix unsigned integer overflow in xmlTextReaderPushData 
Return immediately if xmlParserInputBufferRead fails.

Found by OSS-Fuzz, see #344.
 2023-08-14 15:06:31 +02:00
Nick Wellnhofer
320f5084cd parser: Improve handling of encoding and IO errors 
Make sure that xmlCharEncInput, xmlParserInputBufferPush and
xmlParserInputBufferGrow set the correct error code in the
xmlParserInputBuffer. Handle errors when calling these functions.
 2023-04-30 21:31:54 +02:00
Nick Wellnhofer
c266a22023 malloc-fail: Handle memory errors in xmlTextReaderEntPush 
Unfortunately, there's no way to properly report memory errors.

Found with libFuzzer, see #344.
 2023-01-24 11:32:15 +01:00
Nick Wellnhofer
f67dc6189f xmlreader: Try to fix regression when reading from memory 
This reverts a change from commit 2059df53, see #462.
 2022-12-17 00:14:56 +01:00
Nick Wellnhofer
dd3569eaa5 Remove XMLDECL macro from .c files 2022-12-08 02:43:17 +01:00
Nick Wellnhofer
2059df5358 buf: Deprecate static/immutable buffers 2022-11-20 21:16:03 +01:00
Nick Wellnhofer
1ca0dfec35 reader: Switch to xmlParserInputBufferCreateMem 
This is less efficient but can't result in input buffer overreads.

Fixes #326.
 2022-11-20 21:16:03 +01:00