diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-11-07 16:17:48 -0800 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2014-11-07 16:32:55 -0800 |
| commit | e992e75053e98e3699af6e344c11b787e30411ad (patch) | |
| tree | c0a88c5e09f9f4a7fdcb56eda9c60497124bf783 /services/camera/libcameraservice/common | |
| parent | e1a2df553a6d151807a5da738a3cd853bef908d9 (diff) | |
| download | frameworks_av-e992e75053e98e3699af6e344c11b787e30411ad.zip frameworks_av-e992e75053e98e3699af6e344c11b787e30411ad.tar.gz frameworks_av-e992e75053e98e3699af6e344c11b787e30411ad.tar.bz2 | |
Camera: Guard against asBinder() calls on NULL interfaces
Bug: 18207548
Change-Id: I9879c9b4c0282a6b96b77398f62beedc47f7f0a0
Diffstat (limited to 'services/camera/libcameraservice/common')
| -rw-r--r-- | services/camera/libcameraservice/common/Camera2ClientBase.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/common/Camera2ClientBase.cpp b/services/camera/libcameraservice/common/Camera2ClientBase.cpp index d6db151..eb91bd4 100644 --- a/services/camera/libcameraservice/common/Camera2ClientBase.cpp +++ b/services/camera/libcameraservice/common/Camera2ClientBase.cpp @@ -128,7 +128,8 @@ status_t Camera2ClientBase<TClientBase>::dump(int fd, String8 result; result.appendFormat("Camera2ClientBase[%d] (%p) PID: %d, dump:\n", TClientBase::mCameraId, - TClientBase::getRemoteCallback()->asBinder().get(), + (TClientBase::getRemoteCallback() != NULL ? + TClientBase::getRemoteCallback()->asBinder().get() : NULL), TClientBase::mClientPid); result.append(" State: "); |