[neon/qt6/qt6-base/Neon/release] debian/patches: drop patch that's already in 6.9
Carlos De Maine
null at kde.org
Sun Apr 20 10:31:41 BST 2025
Git commit ffb026b0df4f6ab39cf3d2a4d0903e8f1933044f by Carlos De Maine.
Committed on 20/04/2025 at 08:39.
Pushed by carlosdem into branch 'Neon/release'.
drop patch that's already in 6.9
D +0 -192 debian/patches/buffer-overflow.patch
M +0 -1 debian/patches/series
https://invent.kde.org/neon/qt6/qt6-base/-/commit/ffb026b0df4f6ab39cf3d2a4d0903e8f1933044f
diff --git a/debian/patches/buffer-overflow.patch b/debian/patches/buffer-overflow.patch
deleted file mode 100644
index 992d5c0..0000000
--- a/debian/patches/buffer-overflow.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-diff --git a/src/gui/text/qtextmarkdownimporter.cpp b/src/gui/text/qtextmarkdownimporter.cpp
-index 5f7ef2220e6152916db9eb213d058f813eb7542f..137a0bdbc14120ebf7a6392ee85edb2548097a7a 100644 (file)
---- a/src/gui/text/qtextmarkdownimporter.cpp
-+++ b/src/gui/text/qtextmarkdownimporter.cpp
-@@ -28,7 +28,8 @@ Q_LOGGING_CATEGORY(lcMD, "qt.text.markdown")
- static const QChar qtmi_Newline = u'\n';
- static const QChar qtmi_Space = u' ';
-
--static constexpr auto markerString() noexcept { return "---"_L1; }
-+static constexpr auto lfMarkerString() noexcept { return "---\n"_L1; }
-+static constexpr auto crlfMarkerString() noexcept { return "---r\n"_L1; }
-
- // TODO maybe eliminate the margins after all views recognize BlockQuoteLevel, CSS can format it, etc.
- static const int qtmi_BlockQuoteIndent =
-@@ -120,6 +121,47 @@ QTextMarkdownImporter::QTextMarkdownImporter(QTextDocument *doc, QTextDocument::
- {
- }
-
-+/*! \internal
-+ Split any Front Matter from the Markdown document \a md.
-+ Returns a pair of QStringViews: if \a md begins with qualifying Front Matter
-+ (according to the specification at https://jekyllrb.com/docs/front-matter/ ),
-+ put it into the \c frontMatter view, omitting both markers; and put the remaining
-+ Markdown into \c rest. If no Front Matter is found, return all of \a md in \c rest.
-+*/
-+static auto splitFrontMatter(QStringView md)
-+{
-+ struct R {
-+ QStringView frontMatter, rest;
-+ explicit operator bool() const noexcept { return !frontMatter.isEmpty(); }
-+ };
-+
-+ const auto NotFound = R{{}, md};
-+
-+ /* Front Matter must start with '---\n' or '---\r\n' on the very first line,
-+ and Front Matter must end with another such line.
-+ If that is not the case, we return NotFound: then the whole document is
-+ to be passed on to the Markdown parser, in which '---\n' is interpreted
-+ as a "thematic break" (like <hr/> in HTML). */
-+ QLatin1StringView marker;
-+ if (md.startsWith(lfMarkerString()))
-+ marker = lfMarkerString();
-+ else if (md.startsWith(crlfMarkerString()))
-+ marker = crlfMarkerString();
-+ else
-+ return NotFound;
-+
-+ const auto frontMatterStart = marker.size();
-+ const auto endMarkerPos = md.indexOf(marker, frontMatterStart);
-+
-+ if (endMarkerPos < 0 || md[endMarkerPos - 1] != QChar::LineFeed)
-+ return NotFound;
-+
-+ Q_ASSERT(frontMatterStart < md.size());
-+ Q_ASSERT(endMarkerPos < md.size());
-+ const auto frontMatter = md.sliced(frontMatterStart, endMarkerPos - frontMatterStart);
-+ return R{frontMatter, md.sliced(endMarkerPos + marker.size())};
-+}
-+
- void QTextMarkdownImporter::import(const QString &markdown)
- {
- MD_PARSER callbacks = {
-@@ -144,21 +186,14 @@ void QTextMarkdownImporter::import(const QString &markdown)
- qCDebug(lcMD) << "default font" << defaultFont << "mono font" << m_monoFont;
- QStringView md = markdown;
-
-- if (m_features.testFlag(QTextMarkdownImporter::FeatureFrontMatter) && md.startsWith(markerString())) {
-- qsizetype endMarkerPos = md.indexOf(markerString(), markerString().size() + 1);
-- if (endMarkerPos > 4) {
-- qsizetype firstLinePos = 4; // first line of yaml
-- while (md.at(firstLinePos) == '\n'_L1 || md.at(firstLinePos) == '\r'_L1)
-- ++firstLinePos;
-- auto frontMatter = md.sliced(firstLinePos, endMarkerPos - firstLinePos);
-- firstLinePos = endMarkerPos + 4; // first line of markdown after yaml
-- while (md.size() > firstLinePos && (md.at(firstLinePos) == '\n'_L1 || md.at(firstLinePos) == '\r'_L1))
-- ++firstLinePos;
-- md = md.sliced(firstLinePos);
-- doc->setMetaInformation(QTextDocument::FrontMatter, frontMatter.toString());
-- qCDebug(lcMD) << "extracted FrontMatter: size" << frontMatter.size();
-+ if (m_features.testFlag(QTextMarkdownImporter::FeatureFrontMatter)) {
-+ if (const auto split = splitFrontMatter(md)) {
-+ doc->setMetaInformation(QTextDocument::FrontMatter, split.frontMatter.toString());
-+ qCDebug(lcMD) << "extracted FrontMatter: size" << split.frontMatter.size();
-+ md = split.rest;
- }
- }
-+
- const auto mdUtf8 = md.toUtf8();
- m_cursor.beginEditBlock();
- md_parse(mdUtf8.constData(), MD_SIZE(mdUtf8.size()), &callbacks, this);
-diff --git a/tests/auto/gui/text/qtextmarkdownimporter/data/front-marker-malformed1.md b/tests/auto/gui/text/qtextmarkdownimporter/data/front-marker-malformed1.md
-new file mode 100644 (file)
-index 0000000..8923d75
---- /dev/null
-+++ b/tests/auto/gui/text/qtextmarkdownimporter/data/front-marker-malformed1.md
-@@ -0,0 +1,3 @@
-+---
-+name: "Pluto"---
-+Pluto may not be a planet. And this document does not contain Front Matter.
-diff --git a/tests/auto/gui/text/qtextmarkdownimporter/data/front-marker-malformed2.md b/tests/auto/gui/text/qtextmarkdownimporter/data/front-marker-malformed2.md
-new file mode 100644 (file)
-index 0000000..1c03291
---- /dev/null
-+++ b/tests/auto/gui/text/qtextmarkdownimporter/data/front-marker-malformed2.md
-@@ -0,0 +1,5 @@
-+---
-+name: "Sloppy"
-+---
-+This document has trailing whitespace after its second Front Matter marker.
-+Therefore the marker does not qualify, and the document does not have Front Matter.
-diff --git a/tests/auto/gui/text/qtextmarkdownimporter/data/front-marker-malformed3.md b/tests/auto/gui/text/qtextmarkdownimporter/data/front-marker-malformed3.md
-new file mode 100644 (file)
-index 0000000..9621704
---- /dev/null
-+++ b/tests/auto/gui/text/qtextmarkdownimporter/data/front-marker-malformed3.md
-@@ -0,0 +1,4 @@
-+---
-+name: "Aborted YAML"
-+description: "The ending marker does not end with a newline, so it's invalid."
-+---
-\ No newline at end of file
-diff --git a/tests/auto/gui/text/qtextmarkdownimporter/data/oss-fuzz-42533775.md b/tests/auto/gui/text/qtextmarkdownimporter/data/oss-fuzz-42533775.md
-new file mode 100644 (file)
-index 0000000..04ff53a
---- /dev/null
-+++ b/tests/auto/gui/text/qtextmarkdownimporter/data/oss-fuzz-42533775.md
-@@ -0,0 +1 @@
-+--- ---
-\ No newline at end of file
-diff --git a/tests/auto/gui/text/qtextmarkdownimporter/data/yaml-crlf.md b/tests/auto/gui/text/qtextmarkdownimporter/data/yaml-crlf.md
-new file mode 100644 (file)
-index 0000000..c3e5243
---- /dev/null
-+++ b/tests/auto/gui/text/qtextmarkdownimporter/data/yaml-crlf.md
-@@ -0,0 +1,10 @@
-+---\r
-+name: "Venus"\r
-+discoverer: "Galileo Galilei"\r
-+title: "A description of the planet Venus"\r
-+keywords:\r
-+ - planets\r
-+ - solar system\r
-+ - astronomy\r
-+---\r
-+*Venus* is the second planet from the Sun, orbiting it every 224.7 Earth days.\r
-diff --git a/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp b/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
-index d9fe000253b5c5b58907ae354dc62852d76b1db9..1a71b48ee6c2563be3b48a5291f38054728a7f36 100644 (file)
---- a/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
-+++ b/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
-@@ -548,6 +548,7 @@ void tst_QTextMarkdownImporter::pathological_data()
- QTest::addColumn<QString>("warning");
- QTest::newRow("fuzz20450") << "attempted to insert into a list that no longer exists";
- QTest::newRow("fuzz20580") << "";
-+ QTest::newRow("oss-fuzz-42533775") << ""; // caused a heap-buffer-overflow
- }
-
- void tst_QTextMarkdownImporter::pathological() // avoid crashing on crazy input
-@@ -644,15 +645,21 @@ void tst_QTextMarkdownImporter::fencedCodeBlocks()
- void tst_QTextMarkdownImporter::frontMatter_data()
- {
- QTest::addColumn<QString>("inputFile");
-+ QTest::addColumn<int>("expectedFrontMatterSize");
- QTest::addColumn<int>("expectedBlockCount");
-
-- QTest::newRow("yaml + markdown") << QFINDTESTDATA("data/yaml.md") << 1;
-- QTest::newRow("yaml only") << QFINDTESTDATA("data/yaml-only.md") << 0;
-+ QTest::newRow("yaml + markdown") << QFINDTESTDATA("data/yaml.md") << 140 << 1;
-+ QTest::newRow("yaml + markdown with CRLFs") << QFINDTESTDATA("data/yaml-crlf.md") << 140 << 1;
-+ QTest::newRow("yaml only") << QFINDTESTDATA("data/yaml-only.md") << 59 << 0;
-+ QTest::newRow("malformed 1") << QFINDTESTDATA("data/front-marker-malformed1.md") << 0 << 1;
-+ QTest::newRow("malformed 2") << QFINDTESTDATA("data/front-marker-malformed2.md") << 0 << 2;
-+ QTest::newRow("malformed 3") << QFINDTESTDATA("data/front-marker-malformed3.md") << 0 << 1;
- }
-
- void tst_QTextMarkdownImporter::frontMatter()
- {
- QFETCH(QString, inputFile);
-+ QFETCH(int, expectedFrontMatterSize);
- QFETCH(int, expectedBlockCount);
-
- QFile f(inputFile);
-@@ -672,7 +679,9 @@ void tst_QTextMarkdownImporter::frontMatter()
- ++blockCount;
- }
- QCOMPARE(blockCount, expectedBlockCount); // yaml is not part of the markdown text
-- QCOMPARE(doc.metaInformation(QTextDocument::FrontMatter), yaml); // without fences
-+ if (expectedFrontMatterSize)
-+ QCOMPARE(doc.metaInformation(QTextDocument::FrontMatter), yaml); // without fences
-+ QCOMPARE(doc.metaInformation(QTextDocument::FrontMatter).size(), expectedFrontMatterSize);
- }
-
- void tst_QTextMarkdownImporter::toRawText_data()
diff --git a/debian/patches/series b/debian/patches/series
index 4322d29..874bf2f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
# Neon added
-buffer-overflow.patch
# Needs to be fixed upstream.
Add-SH-detection.patch
More information about the Neon-commits
mailing list