commit: ea71cd8b2e75b469241f06749fe6f4161f2c1c4d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 18 20:54:38 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 18 20:54:38 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ea71cd8b
kde-apps/k3b: Disable broken test
Gentoo-bug: 628166
Package-Manager: Portage-2.3.8, Repoman-2.3.3
kde-apps/k3b/files/k3b-17.04.3-out-of-bounds.patch | 75 ----------------------
kde-apps/k3b/k3b-17.08.49.9999.ebuild | 11 +++-
2 files changed, 9 insertions(+), 77 deletions(-)
diff --git a/kde-apps/k3b/files/k3b-17.04.3-out-of-bounds.patch
b/kde-apps/k3b/files/k3b-17.04.3-out-of-bounds.patch
deleted file mode 100644
index 83034e7481..0000000000
--- a/kde-apps/k3b/files/k3b-17.04.3-out-of-bounds.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 7f0be6a33b8260f7789c6aeed58be8d1c844229a Mon Sep 17 00:00:00 2001
-From: Leslie Zhai <lesliez...@llvm.org.cn>
-Date: Tue, 1 Aug 2017 14:13:05 +0800
-Subject: Fix K3b::Device::from2Byte out-of-bounds issue.
-
-A great bug report by Mark!
-
-BUG: 382941
----
- libk3bdevice/k3bdeviceglobals.cpp | 24 ++++++++++++------------
- tests/k3bdeviceglobalstest.cpp | 4 +++-
- 2 files changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/libk3bdevice/k3bdeviceglobals.cpp
b/libk3bdevice/k3bdeviceglobals.cpp
-index 090ed29..c016f59 100644
---- a/libk3bdevice/k3bdeviceglobals.cpp
-+++ b/libk3bdevice/k3bdeviceglobals.cpp
-@@ -212,27 +212,27 @@ void K3b::Device::debugBitfield( unsigned char* data,
long len )
- }
-
-
--quint16 K3b::Device::from2Byte( const unsigned char* d )
-+quint16 K3b::Device::from2Byte(const unsigned char* d)
- {
-- if (d == NULL) {
-- qWarning() << "Invalid nullptr!";
-+ if (d == NULL || strlen((const char *) d) < 2) {
-+ qWarning() << "Invalid Byte!";
- return 0;
- }
-- return ( (d[0] << 8 & 0xFF00) |
-- (d[1] & 0xFF) );
-+ return ((d[0] << 8 & 0xFF00) |
-+ (d[1] & 0xFF));
- }
-
-
--quint32 K3b::Device::from4Byte( const unsigned char* d )
-+quint32 K3b::Device::from4Byte(const unsigned char* d)
- {
-- if (d == NULL) {
-- qWarning() << "Invalid nullptr!";
-+ if (d == NULL || strlen((const char *) d) < 4) {
-+ qWarning() << "Invalid Byte!";
- return 0;
- }
-- return ( (d[0] << 24 & 0xFF000000) |
-- (d[1] << 16 & 0xFF0000) |
-- (d[2] << 8 & 0xFF00) |
-- (d[3] & 0xFF) );
-+ return ((d[0] << 24 & 0xFF000000) |
-+ (d[1] << 16 & 0xFF0000) |
-+ (d[2] << 8 & 0xFF00) |
-+ (d[3] & 0xFF));
- }
-
-
-diff --git a/tests/k3bdeviceglobalstest.cpp b/tests/k3bdeviceglobalstest.cpp
-index 307b772..635ee39 100644
---- a/tests/k3bdeviceglobalstest.cpp
-+++ b/tests/k3bdeviceglobalstest.cpp
-@@ -23,8 +23,10 @@ DeviceGlobalsTest::DeviceGlobalsTest()
-
- void DeviceGlobalsTest::testFrom2Byte()
- {
-- const unsigned char* d = NULL;
-+ unsigned char* d = NULL;
- QCOMPARE(K3b::Device::from2Byte(d), (quint16)0);
-+ unsigned char buf[1] = { '\0' };
-+ QCOMPARE(K3b::Device::from2Byte(buf), (quint16)0);
- }
-
- void DeviceGlobalsTest::testFrom4Byte()
---
-cgit v0.11.2
diff --git a/kde-apps/k3b/k3b-17.08.49.9999.ebuild
b/kde-apps/k3b/k3b-17.08.49.9999.ebuild
index 70aec75bf0..6e1046bf8d 100644
--- a/kde-apps/k3b/k3b-17.08.49.9999.ebuild
+++ b/kde-apps/k3b/k3b-17.08.49.9999.ebuild
@@ -77,8 +77,6 @@ REQUIRED_USE="
DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
-PATCHES=( "${FILESDIR}/${PN}-17.04.3-out-of-bounds.patch" )
-
src_configure() {
local mycmakeargs=(
-DK3B_BUILD_API_DOCS=OFF
@@ -104,6 +102,15 @@ src_configure() {
kde5_src_configure
}
+src_test() {
+ # 628166
+ local myctestargs=(
+ -E "(k3bdeviceglobalstest)"
+ )
+
+ kde5_src_test
+}
+
pkg_postinst() {
kde5_pkg_postinst
