commit: 1dad375a54557f44c6cb404433cd7915f9c8a2eb Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Aug 3 00:39:44 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Aug 3 00:39:44 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1dad375a
kde-apps/k3b: Fix K3b::Device::from2Byte out-of-bounds issue See also: https://bugs.kde.org/show_bug.cgi?id=382941 Gentoo-bug: 616880 Package-Manager: Portage-2.3.6, Repoman-2.3.1 kde-apps/k3b/files/k3b-17.04.3-out-of-bounds.patch | 75 ++++++++++++++++++++++ kde-apps/k3b/k3b-17.08.49.9999.ebuild | 2 + 2 files changed, 77 insertions(+) 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 new file mode 100644 index 0000000000..83034e7481 --- /dev/null +++ b/kde-apps/k3b/files/k3b-17.04.3-out-of-bounds.patch @@ -0,0 +1,75 @@ +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 c5366a7575..70aec75bf0 100644 --- a/kde-apps/k3b/k3b-17.08.49.9999.ebuild +++ b/kde-apps/k3b/k3b-17.08.49.9999.ebuild @@ -77,6 +77,8 @@ 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
