Merge lp:~afrantzis/powerd/fix-1486284-abort-during-shutdown into lp:powerd

Proposed by Alexandros Frantzis on 2016-02-04
Status: Merged
Approved by: Alexandros Frantzis on 2016-02-04
Approved revision: 183
Merged at revision: 183
Proposed branch: lp:~afrantzis/powerd/fix-1486284-abort-during-shutdown
Merge into: lp:powerd
Diff against target: 28 lines (+11/-0)
2 files modified
debian/changelog (+7/-0)
src/wakeup.cpp (+4/-0)
To merge this branch: bzr merge lp:~afrantzis/powerd/fix-1486284-abort-during-shutdown
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team 2016-02-04 Pending
Review via email: mp+285064@code.launchpad.net

Commit message

Fix crash during shutdown, caused by destroying an unjoined std::thread object (LP: #1486284)

Description of the change

Fix crash during shutdown, caused by destroying an unjoined std::thread object (LP: #1486284)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-01-11 13:34:19 +0000
3+++ debian/changelog 2016-02-04 14:16:39 +0000
4@@ -1,3 +1,10 @@
5+powerd (0.16+16.04.20160204-0ubuntu1) xenial; urgency=medium
6+
7+ * Fix crash during shutdown, caused by destroying an unjoined
8+ std::thread object (LP: #1486284)
9+
10+ -- Alexandros Frantzis <alexandros.frantzis@canonical.com> Thu, 04 Feb 2016 16:07:11 +0200
11+
12 powerd (0.16+16.04.20160111.1-0ubuntu1) xenial; urgency=medium
13
14 [ CI Train Bot ]
15
16=== modified file 'src/wakeup.cpp'
17--- src/wakeup.cpp 2014-08-19 01:12:27 +0000
18+++ src/wakeup.cpp 2016-02-04 14:16:39 +0000
19@@ -152,6 +152,10 @@
20 {
21 requests.clear();
22 reset_alarm_clock();
23+ if (worker) {
24+ worker->join();
25+ worker.reset();
26+ }
27 g_clear_pointer(&hardware_alarm, u_hardware_alarm_unref);
28 }
29

Subscribers

People subscribed via source and target branches