summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2009-11-13 15:26:29 -0800
committerMathias Agopian <mathias@google.com>2009-11-13 15:26:29 -0800
commit963abad79ae64dae9bf4c32bfb110d9e6314c857 (patch)
treef017c89f91c07d4bc06c8c74efbc03aa73463572 /include
parent8b1b9f4e9ca3816777d7228bec2182e16f38a093 (diff)
downloadframeworks_native-963abad79ae64dae9bf4c32bfb110d9e6314c857.zip
frameworks_native-963abad79ae64dae9bf4c32bfb110d9e6314c857.tar.gz
frameworks_native-963abad79ae64dae9bf4c32bfb110d9e6314c857.tar.bz2
fix some aspects of [2258746] native crash in launcher2
Surface::validate() could sometimes dereference a null pointer before checking it wasn't null. This will prevent the application to crash when given bad parameters or used incorrectly. However, the bug above probably has another cause.
Diffstat (limited to 'include')
-rw-r--r--include/ui/Surface.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/ui/Surface.h b/include/ui/Surface.h
index 70303cd..008c297 100644
--- a/include/ui/Surface.h
+++ b/include/ui/Surface.h
@@ -109,7 +109,7 @@ private:
~SurfaceControl();
- status_t validate(SharedClient const* cblk) const;
+ status_t validate() const;
void destroy();
sp<SurfaceComposerClient> mClient;
@@ -190,7 +190,7 @@ private:
status_t getBufferLocked(int index, int usage);
- status_t validate(SharedClient const* cblk) const;
+ status_t validate() const;
inline const GraphicBufferMapper& getBufferMapper() const { return mBufferMapper; }
inline GraphicBufferMapper& getBufferMapper() { return mBufferMapper; }