commit dc8e458145b00ab8ba6426eb33a8bd5e89d06d8a
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jan 12 01:24:00 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 12 01:24:00 2017 +0000
tree 738b74742c7731b39221463ebc181bbb7561cbeb
parent a8d358fb6313724ab1ae68c487c2006569cd5091
parent c591f88faed84ac9d69507a35f5b1bfbfb8ab74a

Merge "add checks to avoid potential buffer overflows and prevent exceptions"

power/1.0/default/Power.cpp

diff --git a/power/1.0/default/Power.cpp b/power/1.0/default/Power.cpp
index 29594eb..820c410 100644
--- a/power/1.0/default/Power.cpp
+++ b/power/1.0/default/Power.cpp
@@ -78,7 +78,9 @@
     number_platform_modes = mModule->get_number_of_platform_modes(mModule);
     if (number_platform_modes > 0)
     {
-       voters = new size_t [number_platform_modes];
+       if (SIZE_MAX / sizeof(size_t) <= number_platform_modes)  // overflow
+           goto done;
+       voters = new (std::nothrow) size_t [number_platform_modes];
        if (voters == nullptr)
            goto done;
 
@@ -86,7 +88,11 @@
        if (ret != 0)
            goto done;
 
-       legacy_states = new power_state_platform_sleep_state_t [number_platform_modes];
+       if (SIZE_MAX / sizeof(power_state_platform_sleep_state_t)
+           <= number_platform_modes)  // overflow
+           goto done;
+       legacy_states = new (std::nothrow)
+           power_state_platform_sleep_state_t [number_platform_modes];
        if (legacy_states == nullptr)
            goto done;