Merge lp://qastaging/~timo-jyrinki/unity/ubuntu.lp806248-fix-int32-buffer-overflow-5.0 into lp://qastaging/~ubuntu-desktop/unity/precise
Proposed by
Timo Jyrinki
| Status: | Merged |
|---|---|
| Merged at revision: | 712 |
| Proposed branch: | lp://qastaging/~timo-jyrinki/unity/ubuntu.lp806248-fix-int32-buffer-overflow-5.0 |
| Merge into: | lp://qastaging/~ubuntu-desktop/unity/precise |
| Diff against target: |
285 lines (+75/-23) 7 files modified
debian/changelog (+8/-0) plugins/unityshell/src/ElapsedTimeMonitor.cpp (+1/-1) plugins/unityshell/src/Launcher.cpp (+13/-13) plugins/unityshell/src/SwitcherView.cpp (+3/-3) plugins/unityshell/src/TimeUtil.h (+11/-6) tests/CMakeLists.txt (+1/-0) tests/test_time_util.cpp (+38/-0) |
| To merge this branch: | bzr merge lp://qastaging/~timo-jyrinki/unity/ubuntu.lp806248-fix-int32-buffer-overflow-5.0 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Desktop | Pending | ||
|
Review via email:
|
|||
Commit message
Change TimeUtil to use int64, so the buffer wont overflow within our lifetimes. (LP: #806248)
Description of the change
Change TimeUtil to use int64, so the buffer wont overflow within our lifetimes. (LP: #806248)
bzr cherry-picked this one for Chris, identical to his debdiff. The same patch is already published in quantal-updates.
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
