lp://qastaging/~brandontschaefer/unity/lp806248-fix-int32-buffer-overflow-4.0

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://qastaging/~ubuntu-desktop/unity/precise

Stephen M. Webb (community): Disapprove on 2013-01-28

Ubuntu Desktop: Pending requested 2013-01-18

Diff: 3906 lines (+2970/-5) (has conflicts)

37 files modified

AUTHORS (+8/-0)
CMakeLists.txt (+15/-0)
ChangeLog (+280/-0)
manual-tests/QuicklistOnExpo.txt (+14/-0)
manual-tests/ReadMe.txt (+47/-0)
manual-tests/custom-dash-home/HomeShortcutsCustomized-4-entries.json (+22/-0)
manual-tests/custom-dash-home/HomeShortcutsCustomized-8-entries.json (+44/-0)
manual-tests/custom-dash-home/HomeShortcutsCustomized-broken.json (+23/-0)
manual-tests/custom-dash-home/custom-dash-home.txt (+46/-0)
manual-tests/launcher.txt (+14/-0)
plugins/unityshell/src/DashView.cpp (+57/-0)
plugins/unityshell/src/DashView.h (+11/-0)
plugins/unityshell/src/ElapsedTimeMonitor.cpp (+1/-1)
plugins/unityshell/src/GeisAdapter.cpp (+1/-1)
plugins/unityshell/src/Launcher.cpp (+204/-0)
plugins/unityshell/src/LauncherIcon.cpp (+61/-0)
plugins/unityshell/src/LauncherIcon.h (+14/-0)
plugins/unityshell/src/PanelMenuView.cpp (+46/-0)
plugins/unityshell/src/PanelTray.cpp (+10/-0)
plugins/unityshell/src/PanelView.cpp (+5/-0)
plugins/unityshell/src/ScreenEffectFramebufferObject.cpp (+237/-0)
plugins/unityshell/src/ScreenEffectFramebufferObject.h (+87/-0)
plugins/unityshell/src/SwitcherController.cpp (+15/-0)
plugins/unityshell/src/SwitcherController.h (+1/-0)
plugins/unityshell/src/SwitcherModel.cpp (+7/-0)
plugins/unityshell/src/SwitcherView.cpp (+6/-2)
plugins/unityshell/src/TimeUtil.h (+17/-0)
plugins/unityshell/src/unityshell.cpp (+363/-1)
plugins/unityshell/src/unityshell.h (+75/-0)
tests/CMakeLists.txt (+444/-0)
tests/GLFuncLoader.cpp (+51/-0)
tests/GLFuncLoader.h (+33/-0)
tests/TestScreenEffectFramebufferObject.cpp (+671/-0)
tests/test-get-transients/CMakeLists.txt (+1/-0)
tests/test-input-remover/CMakeLists.txt (+1/-0)
tests/test-minimize-window-handler/CMakeLists.txt (+1/-0)
tests/test_time_util.cpp (+37/-0)

api

Rejected for merging into lp://qastaging/unity/4.0

Andrea Azzarone (community): Approve on 2013-01-03

Diff: 288 lines (+69/-26)

6 files modified

plugins/unityshell/src/ElapsedTimeMonitor.cpp (+1/-1)
plugins/unityshell/src/Launcher.cpp (+18/-18)
plugins/unityshell/src/SwitcherView.cpp (+3/-3)
plugins/unityshell/src/TimeUtil.h (+9/-4)
tests/CMakeLists.txt (+1/-0)
tests/test_time_util.cpp (+37/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #806248: unity::TimeUtil::TimeDelta returns an int value which overflows after 24 days of uptime

High

Fix Released

Link a bug report

Related blueprints

1740. By Brandon Schaefer on 2012-12-05

* Fix header

1739. By Brandon Schaefer on 2012-12-03

* Fix int32 buffer overflow in TimeUtil, now uses int64

1738. By Łukasz Zemczak on 2012-09-12

Release\ 4.30.0

1737. By Francis Ginther on 2012-09-07

Updated dependency to the renamed libgeis

1736. By Sam Spilsbury on 2012-01-19

Merge lp:unity/4.0

1735. By Sam Spilsbury on 2012-01-19

Unrevert 1721 , as it did not cause any regressions (yet)

1734. By Sam Spilsbury on 2012-01-19

Revert 1721 for now

It enters some strange codepaths and caused regressions better handled by
https://code.launchpad.net/~smspillaz/unity/unity.fix_881190_918360/+merge/89181

1733. By Sam Spilsbury on 2012-01-19

Merge lp:~smspillaz/unity/4.0_fix_912682

1732. By David Barth on 2012-01-05

Bumping revision to 4.2.28 to prepare a new SRU

1731. By David Barth on 2012-01-05

Fix for "right-clicking launcher when choosing a workspace causes quicklists to freeze" (#791810)