From 98cfb5cee9fb7bdf9c1ede396c786be2ad0c4b33 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 4 Apr 2018 12:26:52 +0200
Subject: [PATCH] Add check for catalog support in libxml2
Since https://codereview.chromium.org/2788063002
libxml2 is expected to have disabled catalog
support. Prevent crashes of render process
and do not link against system libxml2 if it is
compiled with catalog support.
Task-number: QTBUG-66488
Change-Id: I2d922929878262c555802336841536eba1294db2
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
---
config.tests/xml2/xml2.cpp | 37 +++++++++++++++++++++++++++++++++++++
config.tests/xml2/xml2.pro | 3 +++
configure.json | 14 +++++++++++---
configure.pri | 2 +-
4 files changed, 52 insertions(+), 4 deletions(-)
create mode 100644 config.tests/xml2/xml2.cpp
create mode 100644 config.tests/xml2/xml2.pro
diff --git a/config.tests/xml2/xml2.cpp b/config.tests/xml2/xml2.cpp
new file mode 100644
index 000000000..17c3e3ca0
--- /dev/null
+++ b/config.tests/xml2/xml2.cpp
@@ -0,0 +1,37 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <libxml/xmlversion.h>
+#if defined(LIBXML_CATALOG_ENABLED)
+#error "libxml catalog enabled"
+#endif
+
+int main(int argc, char **argv)
+{
+}
+
diff --git a/config.tests/xml2/xml2.pro b/config.tests/xml2/xml2.pro
new file mode 100644
index 000000000..6fad45f2f
--- /dev/null
+++ b/config.tests/xml2/xml2.pro
@@ -0,0 +1,3 @@
+SOURCES = xml2.cpp
+CONFIG += link_pkgconfig
+PKGCONFIG += libxml-2.0
diff --git a/configure.json b/configure.json
index ce12b05b6..d1ae781a6 100644
--- a/configure.json
+++ b/configure.json
@@ -288,9 +288,14 @@
"label": "glibc > 2.16",
"type": "detectGlibc"
},
- "webengine-icuuc": {
+ "webengine-libxml2-with-icuuc": {
"label" : "libxml2 configured with icuuc",
- "type": "detectIcuuc"
+ "type": "detectLibXml2WithIcuuc"
+ },
+ "webengine-libxml2-without-catalog-support": {
+ "label" : "libxml2 configured without catalog support",
+ "test" : "xml2",
+ "type": "compile"
},
"webengine-sanitizer": {
"label" : "sanitizer support",
@@ -580,7 +585,10 @@
},
"webengine-system-libxml2": {
"label": "libxml2 and libxslt",
- "condition": "config.unix && libs.webengine-libxml2 && tests.webengine-icuuc",
+ "condition": "config.unix
+ && libs.webengine-libxml2
+ && tests.webengine-libxml2-with-icuuc
+ && tests.webengine-libxml2-without-catalog-support",
"output": [ "privateFeature" ]
},
"webengine-system-lcms2" : {
diff --git a/configure.pri b/configure.pri
index ecf2ce4d3..db36a7ff7 100644
--- a/configure.pri
+++ b/configure.pri
@@ -147,7 +147,7 @@ defineTest(qtConfTest_embedded) {
return(false)
}
-defineTest(qtConfTest_detectIcuuc) {
+defineTest(qtConfTest_detectLibXml2WithIcuuc) {
pkgConfig = $$qtConfPkgConfig()
!isEmpty(pkgConfig) {
qtRunLoggedCommand("$$pkgConfig --libs --static libxml-2.0", xmllibs)
--
GitLab