Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions ext/dom/tests/gh25305.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
--TEST--
GH-25305 (NULL dereference in lxb_dom_document_destroy on lexbor document init failure)
--CREDITS--
YuanchengJiang
--EXTENSIONS--
dom
--SKIPIF--
<?php
if (getenv("USE_ZEND_ALLOC") === "0") die("skip Zend MM disabled");
?>
--INI--
memory_limit=2M
--FILE--
<?php
$str = str_repeat("a", (int)(1024 * 1024 * 1.25));
Dom\HTMLDocument::createFromString("<p>x</p>");
?>
--EXPECTF--
Fatal error: Allowed memory size of 2097152 bytes exhausted %S(tried to allocate %d bytes) in %s on line %d%A
21 changes: 13 additions & 8 deletions ext/lexbor/lexbor/dom/interfaces/document.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,12 @@ lxb_dom_document_init(lxb_dom_document_t *document, lxb_dom_document_t *owner,

document->css = NULL;

/*
* Set before the allocations: lxb_dom_document_destroy() frees a document
* that owns itself, and dereferences the owner of any other.
*/
node->owner_document = document;

/* For nodes */
document->mraw = lexbor_mraw_create();
status = lexbor_mraw_init(document->mraw, (4096 * 8));
Expand Down Expand Up @@ -166,18 +172,17 @@ lxb_dom_document_init(lxb_dom_document_t *document, lxb_dom_document_t *owner,
goto failed;
}

node->owner_document = document;

return LXB_STATUS_OK;

failed:

lexbor_mraw_destroy(document->mraw, true);
lexbor_mraw_destroy(document->text, true);
lexbor_hash_destroy(document->tags, true);
lexbor_hash_destroy(document->ns, true);
lexbor_hash_destroy(document->attrs, true);
lexbor_hash_destroy(document->prefix, true);
/* Reset, so that lxb_dom_document_destroy() does not free them again. */
document->mraw = lexbor_mraw_destroy(document->mraw, true);
document->text = lexbor_mraw_destroy(document->text, true);
document->tags = lexbor_hash_destroy(document->tags, true);
document->ns = lexbor_hash_destroy(document->ns, true);
document->attrs = lexbor_hash_destroy(document->attrs, true);
document->prefix = lexbor_hash_destroy(document->prefix, true);

return LXB_STATUS_ERROR;
}
Expand Down
2 changes: 1 addition & 1 deletion ext/lexbor/lexbor/html/interfaces/document.c
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ lxb_html_document_parser_prepare(lxb_html_document_t *document)
status = lxb_html_parser_init(doc->parser);

if (status != LXB_STATUS_OK) {
lxb_html_parser_destroy(doc->parser);
doc->parser = lxb_html_parser_destroy(doc->parser);
return status;
}

Expand Down
6 changes: 6 additions & 0 deletions ext/lexbor/lexbor/html/parser.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,12 @@ lxb_html_parser_init(lxb_html_parser_t *parser)
parser->tkz = lxb_html_tokenizer_create();
lxb_status_t status = lxb_html_tokenizer_init(parser->tkz);

/*
* A tokenizer or a tree that failed to initialize has no reference yet,
* so lxb_html_parser_destroy() could not release it: destroy it here.
*/
if (status != LXB_STATUS_OK) {
parser->tkz = lxb_html_tokenizer_destroy(parser->tkz);
return status;
}

Expand All @@ -51,6 +56,7 @@ lxb_html_parser_init(lxb_html_parser_t *parser)
status = lxb_html_tree_init(parser->tree, parser->tkz);

if (status != LXB_STATUS_OK) {
parser->tree = lxb_html_tree_destroy(parser->tree);
return status;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Sat, 26 Aug 2023 15:08:59 +0200
Subject: [PATCH 01/21] Expose line and column information for use in PHP
Subject: [PATCH 01/22] Expose line and column information for use in PHP

---
source/lexbor/dom/interfaces/node.h | 2 ++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Mon, 14 Aug 2023 20:18:51 +0200
Subject: [PATCH 02/21] Track implied added nodes for options use in PHP
Subject: [PATCH 02/22] Track implied added nodes for options use in PHP

---
source/lexbor/html/tree.h | 3 +++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Thu, 24 Aug 2023 22:57:48 +0200
Subject: [PATCH 03/21] Patch utilities and data structure to be able to
Subject: [PATCH 03/22] Patch utilities and data structure to be able to
generate smaller lookup tables

Changed the generation script to check if everything fits in 32-bits.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Wed, 29 Nov 2023 21:26:47 +0100
Subject: [PATCH 04/21] Remove unused upper case tag static data
Subject: [PATCH 04/22] Remove unused upper case tag static data

---
source/lexbor/tag/res.h | 2 ++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Wed, 29 Nov 2023 21:29:31 +0100
Subject: [PATCH 05/21] Shrink size of static binary search tree
Subject: [PATCH 05/22] Shrink size of static binary search tree

This also makes it more efficient on the data cache.
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Sun, 7 Jan 2024 21:59:28 +0100
Subject: [PATCH 06/21] Patch out unused CSS style code
Subject: [PATCH 06/22] Patch out unused CSS style code

---
source/lexbor/css/rule.h | 2 ++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alexander Borisov <lex.borisov@gmail.com>
Date: Fri, 26 Jun 2026 18:55:56 +0300
Subject: [PATCH 07/21] URL: fixed setters for empty hosts.
Subject: [PATCH 07/22] URL: fixed setters for empty hosts.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alexander Borisov <lex.borisov@gmail.com>
Date: Fri, 5 Jun 2026 22:13:32 +0300
Subject: [PATCH 08/21] URL: fixed uninitialized memory in the path buffer
Subject: [PATCH 08/22] URL: fixed uninitialized memory in the path buffer
growth.

When a path was long enough to outgrow the on-stack buffer, the first
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= <kocsismate@woohoolabs.com>
Date: Thu, 9 Jul 2026 21:51:05 +0200
Subject: [PATCH 09/21] Fix parsing for URL containing empty host and userinfo
Subject: [PATCH 09/22] Fix parsing for URL containing empty host and userinfo

The returned error code (LXB_URL_ERROR_TYPE_INVALID_CREDENTIALS) apparently contradicts the specification:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= <kocsismate@woohoolabs.com>
Date: Fri, 10 Jul 2026 22:31:16 +0200
Subject: [PATCH 10/21] Percent-encode the caret in the path
Subject: [PATCH 10/22] Percent-encode the caret in the path

The caret (^) is part of the path percent-encode set:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alexander Borisov <lex.borisov@gmail.com>
Date: Fri, 5 Jun 2026 22:34:23 +0300
Subject: [PATCH 11/21] CSS: fixed heap buffer overflow in :lexbor-contains()
Subject: [PATCH 11/22] CSS: fixed heap buffer overflow in :lexbor-contains()
parsing.

The contains string buffer was allocated by the size of the string
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alexander Borisov <lex.borisov@gmail.com>
Date: Wed, 10 Jun 2026 19:50:10 +0300
Subject: [PATCH 12/21] Encoding: fixed buffer overflows in malformed decode
Subject: [PATCH 12/22] Encoding: fixed buffer overflows in malformed decode
replay.

Fixed out-of-bounds writes in buffering decoders when replacement output
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alexander Borisov <lex.borisov@gmail.com>
Date: Fri, 5 Jun 2026 21:46:26 +0300
Subject: [PATCH 13/21] URL: fixed tail pointer in URLSearchParams for
Subject: [PATCH 13/22] URL: fixed tail pointer in URLSearchParams for
delimiter-free query.

When a query had a single token without '=' or '&' (e.g. "?abc"), the
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= <tim@bastelstu.be>
Date: Fri, 31 Jul 2026 20:56:18 +0200
Subject: [PATCH 14/21] URL: Fix parsing of usernames containing `@`
Subject: [PATCH 14/22] URL: Fix parsing of usernames containing `@`

Fixes lexbor/lexbor#399.
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alexander Borisov <lex.borisov@gmail.com>
Date: Mon, 7 Sep 2026 22:11:39 +0300
Subject: [PATCH 15/21] Unicode: fixed uninitialized memory in IDNA buffer
Subject: [PATCH 15/22] Unicode: fixed uninitialized memory in IDNA buffer
growth.

When an IDNA buffer outgrew the stack allocation, the move to the heap
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= <kocsismate@woohoolabs.com>
Date: Fri, 11 Sep 2026 21:58:45 +0200
Subject: [PATCH 16/21] URL: encode opaque path spaces before query and
Subject: [PATCH 16/22] URL: encode opaque path spaces before query and
fragment. (#405)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= <tim@tideways-gmbh.com>
Date: Fri, 11 Sep 2026 22:45:33 +0200
Subject: [PATCH 17/21] URL: Fix `lxb_url_serialize_fragment()` without a query
Subject: [PATCH 17/22] URL: Fix `lxb_url_serialize_fragment()` without a query
(#410)

The `lxb_url_serialize_fragment()` function checked if the query contained data
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= <kocsismate@woohoolabs.com>
Date: Tue, 22 Sep 2026 22:20:28 +0200
Subject: [PATCH 18/21] URL: expose component reset functions. (#415)
Subject: [PATCH 18/22] URL: expose component reset functions. (#415)

* URL: expose component reset functions.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= <tim@tideways-gmbh.com>
Date: Sat, 26 Sep 2026 18:41:05 +0200
Subject: [PATCH 19/21] URL: Fix parsing of query and fragment after a
Subject: [PATCH 19/22] URL: Fix parsing of query and fragment after a
dot-component in path (#411)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= <kocsismate@woohoolabs.com>
Date: Mon, 21 Sep 2026 20:01:43 +0200
Subject: [PATCH 20/21] URL: Keep replacement file drive paths hierarchical
Subject: [PATCH 20/22] URL: Keep replacement file drive paths hierarchical
(#423)

WHATWG file state (https://url.spec.whatwg.org/#file-state) step 4.4.3.2 resets the path to an empty list. Do not mark it opaque, as that makes subsequent pathname updates silently do nothing.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alexander Borisov <lex.borisov@gmail.com>
Date: Thu, 24 Sep 2026 15:05:51 +0300
Subject: [PATCH 21/21] URL: normalize output encoding for percent-encoding.
Subject: [PATCH 21/22] URL: normalize output encoding for percent-encoding.

---
source/lexbor/url/url.c | 34 +++++++++++++++++++++++++---------
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: sjanel <67502353+sjanel@users.noreply.github.com>
Date: Wed, 11 Nov 2026 20:26:42 +0100
Subject: [PATCH 22/22] HTML: fixed crash, use-after-free and leaks on
allocation failure in document create and parse (#448)

HTML: fixed crash, use-after-free and leaks on allocation failure.
---
source/lexbor/dom/interfaces/document.c | 21 +++++++++++++--------
source/lexbor/html/interfaces/document.c | 2 +-
source/lexbor/html/parser.c | 6 ++++++
3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/source/lexbor/dom/interfaces/document.c b/source/lexbor/dom/interfaces/document.c
index 43eeba0..6428354 100644
--- a/source/lexbor/dom/interfaces/document.c
+++ b/source/lexbor/dom/interfaces/document.c
@@ -124,6 +124,12 @@ lxb_dom_document_init(lxb_dom_document_t *document, lxb_dom_document_t *owner,

document->css = NULL;

+ /*
+ * Set before the allocations: lxb_dom_document_destroy() frees a document
+ * that owns itself, and dereferences the owner of any other.
+ */
+ node->owner_document = document;
+
/* For nodes */
document->mraw = lexbor_mraw_create();
status = lexbor_mraw_init(document->mraw, (4096 * 8));
@@ -166,18 +172,17 @@ lxb_dom_document_init(lxb_dom_document_t *document, lxb_dom_document_t *owner,
goto failed;
}

- node->owner_document = document;
-
return LXB_STATUS_OK;

failed:

- lexbor_mraw_destroy(document->mraw, true);
- lexbor_mraw_destroy(document->text, true);
- lexbor_hash_destroy(document->tags, true);
- lexbor_hash_destroy(document->ns, true);
- lexbor_hash_destroy(document->attrs, true);
- lexbor_hash_destroy(document->prefix, true);
+ /* Reset, so that lxb_dom_document_destroy() does not free them again. */
+ document->mraw = lexbor_mraw_destroy(document->mraw, true);
+ document->text = lexbor_mraw_destroy(document->text, true);
+ document->tags = lexbor_hash_destroy(document->tags, true);
+ document->ns = lexbor_hash_destroy(document->ns, true);
+ document->attrs = lexbor_hash_destroy(document->attrs, true);
+ document->prefix = lexbor_hash_destroy(document->prefix, true);

return LXB_STATUS_ERROR;
}
diff --git a/source/lexbor/html/interfaces/document.c b/source/lexbor/html/interfaces/document.c
index b40c6c8..5059050 100644
--- a/source/lexbor/html/interfaces/document.c
+++ b/source/lexbor/html/interfaces/document.c
@@ -278,7 +278,7 @@ lxb_html_document_parser_prepare(lxb_html_document_t *document)
status = lxb_html_parser_init(doc->parser);

if (status != LXB_STATUS_OK) {
- lxb_html_parser_destroy(doc->parser);
+ doc->parser = lxb_html_parser_destroy(doc->parser);
return status;
}

diff --git a/source/lexbor/html/parser.c b/source/lexbor/html/parser.c
index 7d05104..62e7370 100644
--- a/source/lexbor/html/parser.c
+++ b/source/lexbor/html/parser.c
@@ -40,7 +40,12 @@ lxb_html_parser_init(lxb_html_parser_t *parser)
parser->tkz = lxb_html_tokenizer_create();
lxb_status_t status = lxb_html_tokenizer_init(parser->tkz);

+ /*
+ * A tokenizer or a tree that failed to initialize has no reference yet,
+ * so lxb_html_parser_destroy() could not release it: destroy it here.
+ */
if (status != LXB_STATUS_OK) {
+ parser->tkz = lxb_html_tokenizer_destroy(parser->tkz);
return status;
}

@@ -51,6 +56,7 @@ lxb_html_parser_init(lxb_html_parser_t *parser)
status = lxb_html_tree_init(parser->tree, parser->tkz);

if (status != LXB_STATUS_OK) {
+ parser->tree = lxb_html_tree_destroy(parser->tree);
return status;
}

Loading