summaryrefslogtreecommitdiff
path: root/libs/gui
diff options
context:
space:
mode:
author Ady Abraham <adyabr@google.com> 2023-04-12 02:15:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-04-12 02:15:50 +0000
commit16724c2c8a4a8425f160f45053bc646d28d80a64 (patch)
treeee2967602f4da69a11ffc2e186f406059d240c5c /libs/gui
parent748cecb7efcee3e7c0d0929444abe1abe0095cfb (diff)
parentf4bd36b72dfde8d67cf62d43d56b8ff27e15e2cc (diff)
SurfaceComposerClient: add a range check in setAlpha am: f4bd36b72d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22434167 Change-Id: I6ab336bed33a26b1bb9fc855ffe43ed1b0ceadc5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/gui')
-rw-r--r--libs/gui/SurfaceComposerClient.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index 0f5192d41c..70013396d6 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -1274,6 +1274,12 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setAlpha
mStatus = BAD_INDEX;
return *this;
}
+ if (alpha < 0.0f || alpha > 1.0f) {
+ ALOGE("SurfaceComposerClient::Transaction::setAlpha: invalid alpha %f", alpha);
+ mStatus = BAD_VALUE;
+ return *this;
+
+ }
s->what |= layer_state_t::eAlphaChanged;
s->alpha = alpha;