From 4da1fe5dbe47b05b357242f46e6e39e5b97357d67ae145ae1bfa0d2f9b059880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 1 Oct 2024 08:44:34 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main libdom revision cb98de0c9b71009e21716728524bd58e --- gcc14-fix-calloc-transposed-args.patch | 47 ++++++++++++++++++++++++++ libdom.changes | 6 ++++ libdom.spec | 2 ++ 3 files changed, 55 insertions(+) create mode 100644 gcc14-fix-calloc-transposed-args.patch diff --git a/gcc14-fix-calloc-transposed-args.patch b/gcc14-fix-calloc-transposed-args.patch new file mode 100644 index 0000000..374d0d6 --- /dev/null +++ b/gcc14-fix-calloc-transposed-args.patch @@ -0,0 +1,47 @@ +Index: b/bindings/xml/expat_xmlparser.c +=================================================================== +--- a/bindings/xml/expat_xmlparser.c ++++ b/bindings/xml/expat_xmlparser.c +@@ -484,7 +484,7 @@ dom_xml_parser_create(const char *enc, c + + UNUSED(int_enc); + +- parser = calloc(sizeof(*parser), 1); ++ parser = calloc(1, sizeof(*parser)); + if (parser == NULL) { + msg(DOM_MSG_CRITICAL, mctx, "No memory for parser"); + return NULL; +Index: b/src/core/node.c +=================================================================== +--- a/src/core/node.c ++++ b/src/core/node.c +@@ -2379,7 +2379,7 @@ static inline dom_exception _dom_event_t + if (t == NULL) { + /* Create the event target list */ + size = 64; +- t = calloc(sizeof(*t), size); ++ t = calloc(size, sizeof(*t)); + if (t == NULL) { + return DOM_NO_MEM_ERR; + } +Index: b/src/html/html_document.c +=================================================================== +--- a/src/html/html_document.c ++++ b/src/html/html_document.c +@@ -134,13 +134,13 @@ dom_exception _dom_html_document_initial + doc->cookie = NULL; + doc->body = NULL; + +- doc->memoised = calloc(sizeof(dom_string *), hds_COUNT); ++ doc->memoised = calloc(hds_COUNT, sizeof(dom_string *)); + if (doc->memoised == NULL) { + error = DOM_NO_MEM_ERR; + goto out; + } +- doc->elements = calloc(sizeof(dom_string *), +- DOM_HTML_ELEMENT_TYPE__COUNT); ++ doc->elements = calloc(DOM_HTML_ELEMENT_TYPE__COUNT, ++ sizeof(dom_string *)); + if (doc->elements == NULL) { + error = DOM_NO_MEM_ERR; + goto out; diff --git a/libdom.changes b/libdom.changes index 8ff4b1a..28e3289 100644 --- a/libdom.changes +++ b/libdom.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 8 14:44:42 UTC 2024 - Antonio Teixeira + +- Add patch gcc14-fix-calloc-transposed-args.patch + * Fix builds with gcc14 + ------------------------------------------------------------------- Fri Jan 12 14:49:30 UTC 2024 - Antonio Teixeira diff --git a/libdom.spec b/libdom.spec index ff7edc1..62d08be 100644 --- a/libdom.spec +++ b/libdom.spec @@ -27,6 +27,8 @@ Summary: C implementation of the W3C DOM API License: MIT URL: http://www.netsurf-browser.org/projects/libdom/ Source: http://download.netsurf-browser.org/libs/releases/%{name}-%{version}-src.tar.gz +# PATCH-FIX-OPENSUSE gcc14-fix-calloc-transposed-args.patch -- Fix builds with gcc14 +Patch1: gcc14-fix-calloc-transposed-args.patch BuildRequires: netsurf-buildsystem BuildRequires: perl(Switch) BuildRequires: perl(XML::Parser::PerlSAX)