ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sf: Add a NULL check in getDisplayConfigs

Browse Source 
Validate the display binder by adding a NULL check in getDisplayConfigs.
This will prevent a false match if the caller queries the display
configs for an inactive display (whose binder is NULL by default).

Without this change we might end up attempting to index the display
config array, which is unpopulated for inactive displays, and this will
result in a crash. (See getDisplayInfo in SurfaceComposerClient.cpp for
an example of this scenario)

Change-Id: I1a12f43b7c375b9c01998dadd5b658275c733fb2
(cherry picked from commit ac71c26e9180d9d181be5ec9e45da72d39144a8b)
This commit is contained in:
Tatenda Chipeperekwa 2014-10-29 16:47:19 -07:00 committed by Dan Stoza
parent 6cd8771c9c
commit 23e16bb5da
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -550,7 +550,7 @@ bool SurfaceFlinger::authenticateSurfaceTexture(
status_t SurfaceFlinger::getDisplayConfigs(const sp<IBinder>& display, status_t SurfaceFlinger::getDisplayConfigs(const sp<IBinder>& display,
Vector<DisplayInfo>* configs) { Vector<DisplayInfo>* configs) {
if (configs == NULL) { if ((configs == NULL) || (display.get() == NULL)) {
return BAD_VALUE; return BAD_VALUE;
} }