diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-23 17:54:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-23 17:54:39 +0000 |
| commit | 56b3f887a2a859eaac9f3c3eb2fa18eb5bf396da (patch) | |
| tree | 9922de502299a5b47ae76a895e299318ae3600f1 /libs/gui | |
| parent | 63a8e04d2da0daf6802ecea2048f9eb9a9a8b878 (diff) | |
| parent | 6ee97e74d2c972dec2aa6a2f231b718eae54898f (diff) | |
| download | frameworks_native-56b3f887a2a859eaac9f3c3eb2fa18eb5bf396da.zip frameworks_native-56b3f887a2a859eaac9f3c3eb2fa18eb5bf396da.tar.gz frameworks_native-56b3f887a2a859eaac9f3c3eb2fa18eb5bf396da.tar.bz2 | |
am 6ee97e74: Merge "Fix a null dereference."
* commit '6ee97e74d2c972dec2aa6a2f231b718eae54898f':
Fix a null dereference.
Diffstat (limited to 'libs/gui')
| -rw-r--r-- | libs/gui/ISurfaceComposerClient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/gui/ISurfaceComposerClient.cpp b/libs/gui/ISurfaceComposerClient.cpp index 3da6423..f199e9f 100644 --- a/libs/gui/ISurfaceComposerClient.cpp +++ b/libs/gui/ISurfaceComposerClient.cpp @@ -114,7 +114,7 @@ status_t BnSurfaceComposerClient::onTransact( status_t result = createSurface(name, w, h, format, flags, &handle, &gbp); reply->writeStrongBinder(handle); - reply->writeStrongBinder(gbp->asBinder()); + reply->writeStrongBinder(gbp != NULL ? gbp->asBinder() : NULL); reply->writeInt32(result); return NO_ERROR; } break; |