diff options
| author | Igor Murashkin <iam@google.com> | 2014-03-18 00:32:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-18 00:32:24 +0000 |
| commit | 9ff25ced1404c896df9e6ed3a6ad289305559361 (patch) | |
| tree | 95dd0a04cc1e9977910131196c4829000c73cfc2 /services/camera/libcameraservice/CameraService.cpp | |
| parent | 314869117d5e3365fc3e43fee01209d18515ca42 (diff) | |
| parent | 557847ee511dd5e75d584ff04449322f0f098241 (diff) | |
| download | frameworks_av-9ff25ced1404c896df9e6ed3a6ad289305559361.zip frameworks_av-9ff25ced1404c896df9e6ed3a6ad289305559361.tar.gz frameworks_av-9ff25ced1404c896df9e6ed3a6ad289305559361.tar.bz2 | |
am 557847ee: am a6ca0acf: am bd3e2e03: camera2: Fix segfault when using null availability listener
* commit '557847ee511dd5e75d584ff04449322f0f098241':
camera2: Fix segfault when using null availability listener
Diffstat (limited to 'services/camera/libcameraservice/CameraService.cpp')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 6fb5a84..b83c315 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -719,6 +719,11 @@ status_t CameraService::addListener( const sp<ICameraServiceListener>& listener) { ALOGV("%s: Add listener %p", __FUNCTION__, listener.get()); + if (listener == 0) { + ALOGE("%s: Listener must not be null", __FUNCTION__); + return BAD_VALUE; + } + Mutex::Autolock lock(mServiceLock); Vector<sp<ICameraServiceListener> >::iterator it, end; @@ -747,6 +752,11 @@ status_t CameraService::removeListener( const sp<ICameraServiceListener>& listener) { ALOGV("%s: Remove listener %p", __FUNCTION__, listener.get()); + if (listener == 0) { + ALOGE("%s: Listener must not be null", __FUNCTION__); + return BAD_VALUE; + } + Mutex::Autolock lock(mServiceLock); Vector<sp<ICameraServiceListener> >::iterator it; |