summaryrefslogtreecommitdiff
path: root/include/ui/Surface.h
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2009-11-13 15:26:29 -0800
committer Mathias Agopian <mathias@google.com> 2009-11-13 15:26:29 -0800
commit18e026066a95e5d63c2ece8007883b46599373ca (patch)
treee7c8d0f1e1cc5283222d635c595da3a2ce1bfc5f /include/ui/Surface.h
parent73f8aa678055598738dfba54c60a1674bcbf02b1 (diff)
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/ui/Surface.h')
-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 70303cdb8c8f..008c297294ab 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; }