summaryrefslogtreecommitdiff
path: root/libs/gui/ISurfaceComposerClient.cpp
diff options
context:
space:
mode:
author Dan Albert <danalbert@google.com> 2014-09-23 17:41:11 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-09-23 17:41:11 +0000
commit6ee97e74d2c972dec2aa6a2f231b718eae54898f (patch)
tree3fd8f9132b755ce86fd67ed8043a13bc0c227032 /libs/gui/ISurfaceComposerClient.cpp
parente1e3d278549eb6389eb0b5fa3f13a4ac079a55a2 (diff)
parentc78a0c17337bcd9dcaa38d61db992ced35eaf1f2 (diff)
Merge "Fix a null dereference."
Diffstat (limited to 'libs/gui/ISurfaceComposerClient.cpp')
-rw-r--r--libs/gui/ISurfaceComposerClient.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/gui/ISurfaceComposerClient.cpp b/libs/gui/ISurfaceComposerClient.cpp
index 1adc134e40..60e25c1470 100644
--- a/libs/gui/ISurfaceComposerClient.cpp
+++ b/libs/gui/ISurfaceComposerClient.cpp
@@ -95,7 +95,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;