diff options
author | Mathias Agopian <mathias@google.com> | 2009-12-10 15:52:29 -0800 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2009-12-10 15:59:08 -0800 |
commit | 083a557c25e0032bc4900f335b6643d0badd09ce (patch) | |
tree | 9857c00ce37ca5faa422d7c710f7175b0cd3ff9e /libs/surfaceflinger/Layer.cpp | |
parent | b9b45a5e26ed020a39a507a173d9f29e336cf989 (diff) | |
download | frameworks_base-083a557c25e0032bc4900f335b6643d0badd09ce.zip frameworks_base-083a557c25e0032bc4900f335b6643d0badd09ce.tar.gz frameworks_base-083a557c25e0032bc4900f335b6643d0badd09ce.tar.bz2 |
fix [2319255] crash in openGL : from the media recorder stress test.
never call eglCreateImageKHR() with a NULL native buffer, which can
happen in OOM conditions.
Diffstat (limited to 'libs/surfaceflinger/Layer.cpp')
-rw-r--r-- | libs/surfaceflinger/Layer.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libs/surfaceflinger/Layer.cpp b/libs/surfaceflinger/Layer.cpp index f11bf18..b12c749 100644 --- a/libs/surfaceflinger/Layer.cpp +++ b/libs/surfaceflinger/Layer.cpp @@ -134,7 +134,14 @@ void Layer::reloadTexture(const Region& dirty) { Mutex::Autolock _l(mLock); sp<GraphicBuffer> buffer(getFrontBufferLocked()); - int index = mFrontBufferIndex; + if (buffer == NULL) { + // this situation can happen if we ran out of memory for instance. + // not much we can do. continue to use whatever texture was bound + // to this context. + return; + } + + const int index = mFrontBufferIndex; // create the new texture name if needed if (UNLIKELY(mTextures[index].name == -1U)) { |