commit fc47a301b7b2b044eddaedc98861d55193ec7dc0
author Marco Nelissen <marcone@google.com> Tue Jun 07 12:26:43 2016 -0700
committer Marco Nelissen <marcone@google.com> Tue Jun 07 12:31:11 2016 -0700
tree 8f64350afe90fc797bba02c7a24720a9c80c31f5
parent b016207fc2442420e8d3a8633575ffe4fc29fef3

Don't use sp<>&

because they may end up pointing to NULL after a NULL check was performed.

Bug: 28166152
Change-Id: Iab2ea30395b620628cc6f3d067dd4f6fcda824fe

media/libmedia/mediaplayer.cpp

diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp
index 0f6d897..370bd2d 100644
--- a/media/libmedia/mediaplayer.cpp
+++ b/media/libmedia/mediaplayer.cpp
@@ -141,7 +141,7 @@
     ALOGV("setDataSource(%s)", url);
     status_t err = BAD_VALUE;
     if (url != NULL) {
-        const sp<IMediaPlayerService>& service(getMediaPlayerService());
+        const sp<IMediaPlayerService> service(getMediaPlayerService());
         if (service != 0) {
             sp<IMediaPlayer> player(service->create(this, mAudioSessionId));
             if ((NO_ERROR != doSetRetransmitEndpoint(player)) ||
@@ -158,7 +158,7 @@
 {
     ALOGV("setDataSource(%d, %lld, %lld)", fd, offset, length);
     status_t err = UNKNOWN_ERROR;
-    const sp<IMediaPlayerService>& service(getMediaPlayerService());
+    const sp<IMediaPlayerService> service(getMediaPlayerService());
     if (service != 0) {
         sp<IMediaPlayer> player(service->create(this, mAudioSessionId));
         if ((NO_ERROR != doSetRetransmitEndpoint(player)) ||
@@ -174,7 +174,7 @@
 {
     ALOGV("setDataSource");
     status_t err = UNKNOWN_ERROR;
-    const sp<IMediaPlayerService>& service(getMediaPlayerService());
+    const sp<IMediaPlayerService> service(getMediaPlayerService());
     if (service != 0) {
         sp<IMediaPlayer> player(service->create(this, mAudioSessionId));
         if ((NO_ERROR != doSetRetransmitEndpoint(player)) ||
@@ -782,7 +782,7 @@
 {
     ALOGV("decode(%s)", url);
     status_t status;
-    const sp<IMediaPlayerService>& service = getMediaPlayerService();
+    const sp<IMediaPlayerService> service = getMediaPlayerService();
     if (service != 0) {
         status = service->decode(url, pSampleRate, pNumChannels, pFormat, heap, pSize);
     } else {
@@ -806,7 +806,7 @@
 {
     ALOGV("decode(%d, %lld, %lld)", fd, offset, length);
     status_t status;
-    const sp<IMediaPlayerService>& service = getMediaPlayerService();
+    const sp<IMediaPlayerService> service = getMediaPlayerService();
     if (service != 0) {
         status = service->decode(fd, offset, length, pSampleRate,
                                  pNumChannels, pFormat, heap, pSize);
@@ -834,7 +834,7 @@
 
 status_t MediaPlayer::updateProxyConfig(
         const char *host, int32_t port, const char *exclusionList) {
-    const sp<IMediaPlayerService>& service = getMediaPlayerService();
+    const sp<IMediaPlayerService> service = getMediaPlayerService();
 
     if (service != NULL) {
         return service->updateProxyConfig(host, port, exclusionList);