From 5e41f4137dd42a9a639be8743ae95c8e159bd4e0 Mon Sep 17 00:00:00 2001
From: David Faure <david.faure@kdab.com>
Date: Tue, 25 Aug 2015 14:30:07 +0200
Subject: QMimeDatabase: warn instead of asserting on bad magic.

An invalid mime magic definition could lead to an assert. Replaced with
a qWarning. Move all checking to the QMimeMagicRule constructor, and do
keep invalid rules since they are need to parse child rules.

Unit test added, with QTest::ignoreMessage when using the XML backend
(there's no warning from update-mime-database when using the cache).
Also make it easier to add more shared mime info files for tests.

Task-number: QTBUG-44319
Done-with: Eike Ziller <eike.ziller@theqtcompany.com>
Change-Id: Ie39a160a106b650cdcee88778fa7eff9e932a988
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 tests/auto/corelib/mimetypes/qmimedatabase/invalid-magic1.xml | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 tests/auto/corelib/mimetypes/qmimedatabase/invalid-magic1.xml

(limited to 'tests/auto/corelib/mimetypes/qmimedatabase/invalid-magic1.xml')

diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/invalid-magic1.xml b/tests/auto/corelib/mimetypes/qmimedatabase/invalid-magic1.xml
new file mode 100644
index 0000000000..04204d8763
--- /dev/null
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/invalid-magic1.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+  <mime-type type="text/invalid-magic1">
+      <comment>wrong value for byte type</comment>
+      <magic>
+          <match value="foo" type="byte" offset="0"/>
+      </magic>
+  </mime-type>
+</mime-info>
-- 
cgit v1.2.3