[SCM] qtbase packaging branch, master, updated. debian/5.5.1+dfsg-13-3-g3f28b76
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Mon Feb 15 17:51:48 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=3f28b76
The following commit has been merged in the master branch:
commit 3f28b76122ce934086032a267c34a71e24a7a077
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Mon Feb 15 14:51:28 2016 -0300
Backport fix_potential_division_by_zero.patch.
---
debian/changelog | 3 +++
.../patches/fix_potential_division_by_zero.patch | 29 ++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 33 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 622c82a..86cc808 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
qtbase-opensource-src (5.5.1+dfsg-14) UNRELEASED; urgency=medium
+ [ Lisandro Damián Nicanor Pérez Meyer ]
* Backport fix_not_delivering_focus.patch to fix not delivering focusIn event
on hide/show.
+ * Backport fix_potential_division_by_zero.patch to fix potential division by
+ zero (Closes: #814699).
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 03 Feb 2016 19:03:04 -0300
diff --git a/debian/patches/fix_potential_division_by_zero.patch b/debian/patches/fix_potential_division_by_zero.patch
new file mode 100644
index 0000000..40c4013
--- /dev/null
+++ b/debian/patches/fix_potential_division_by_zero.patch
@@ -0,0 +1,29 @@
+From 79447068579ea93d616d840bb8cbbf8adb1ed6ec Mon Sep 17 00:00:00 2001
+From: Nicolas Capens <capn at google.com>
+Date: Tue, 10 Nov 2015 00:03:34 -0500
+Subject: [PATCH] Fix potential division by zero.
+
+In a Chrome Remote Desktop session the htotal and/or vtotal timings
+can be zero and lead to a SIGFPE exception.
+
+Task-number: QTBUG-49322
+Change-Id: Id530335cc760d1938ed888ad095427fcf32c651d
+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen at theqtcompany.com>
+Reviewed-by: Nicolas Capens <nicolas.capens at gmail.com>
+Reviewed-by: Gatis Paeglis <gatis.paeglis at theqtcompany.com>
+---
+ src/plugins/platforms/xcb/qxcbscreen.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/src/plugins/platforms/xcb/qxcbscreen.cpp
++++ b/src/plugins/platforms/xcb/qxcbscreen.cpp
+@@ -544,7 +544,8 @@ void QXcbScreen::updateRefreshRate(xcb_r
+ for (; modesIter.rem; xcb_randr_mode_info_next(&modesIter)) {
+ xcb_randr_mode_info_t *modeInfo = modesIter.data;
+ if (modeInfo->id == mode) {
+- m_refreshRate = modeInfo->dot_clock / (modeInfo->htotal * modeInfo->vtotal);
++ const uint32_t dotCount = modeInfo->htotal * modeInfo->vtotal;
++ m_refreshRate = (dotCount != 0) ? modeInfo->dot_clock / dotCount : 0;
+ m_mode = mode;
+ break;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index f20e259..15d3738 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,6 +13,7 @@ multiscreen.diff
xcb_dont_select_XInput_events_on_root_window.patch
xcb_fix_drag_and_drop_when_window_is_hidden.patch
fix_not_delivering_focus.patch
+fix_potential_division_by_zero.patch
# Debian specific.
gnukfreebsd.diff
--
qtbase packaging
More information about the pkg-kde-commits
mailing list