Merge lp:~brandontschaefer/mir/avoid-overflowing-use-long-long into lp:mir

[Brandon Schaefer]

When we have sizeof(long) == sizeof(int) on armhf/i386 we are storing max::long as the max_aspect then we multiple the max::long * <some_value> which ends up overflowing. For now we'll just cast to long long giving us at lease 64bits.

When we have sizeof(long) == sizeof(int) on armhf/i386 we are storing max::long as the max_aspect then we multiple the max::long * <some_value> which ends up overflowing. For now we'll just cast to long long giving us at lease 64bits.

[Chris Halse Rogers (raof)]

Sure, as long as we actually fix this later.

review: Approve

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

[Mir CI Bot (mir-ci-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/1446/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/5084/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1581/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5322
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5310
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5310
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5310

review: Needs Fixing (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:4276
https://mir-jenkins.ubuntu.com/job/mir-ci/3709/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/5083/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5321
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5309
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5309
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5309
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5128/console
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5128/console
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5128/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3709/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/miral/window_info.cpp'
--- src/miral/window_info.cpp	2017-09-15 11:00:10 +0000
+++ src/miral/window_info.cpp	2017-09-29 14:17:35 +0000
@@ -304,7 +304,8 @@
     {
         auto const ar = min_aspect();
 
-        auto const error = new_size.height.as_int()*long(ar.width) - new_size.width.as_int()*long(ar.height);
+        auto const error = new_size.height.as_int()*static_cast<long long>(ar.width) -
+                           new_size.width.as_int() *static_cast<long long>(ar.height);
 
         if (error > 0)
         {
@@ -326,7 +327,8 @@
     {
         auto const ar = max_aspect();
 
-        auto const error = new_size.width.as_int()*long(ar.height) - new_size.height.as_int()*long(ar.width);
+        auto const error = new_size.width.as_int() *static_cast<long long>(ar.height) -
+                           new_size.height.as_int()*static_cast<long long>(ar.width);
 
         if (error > 0)
         {