commit 96a84081d31a1a854f2026fcf507e60c15022db6
author Daichi Hirono <hirono@google.com> Thu Jul 07 17:50:23 2016 +0900
committer Daichi Hirono <hirono@google.com> Thu Jul 07 17:51:19 2016 +0900
tree e91257bb4a145fd029cfb5e87ad4dfda425b3fb2
parent e086bdba217bc013b7a1b5ebe181ccd5fc08ce29

Handle NULL result of strdup.

The check is needed to satisfy @NonNull annotation in Java API.

BUG=26758882

Change-Id: Ie2a45a05593f2a48e23f3ca90302b78ca78a980e

media/mtp/MtpStorageInfo.cpp

diff --git a/media/mtp/MtpStorageInfo.cpp b/media/mtp/MtpStorageInfo.cpp
index 5d4ebbf..8801a38 100644
--- a/media/mtp/MtpStorageInfo.cpp
+++ b/media/mtp/MtpStorageInfo.cpp
@@ -58,8 +58,10 @@
 
     if (!packet.getString(string)) return false;
     mStorageDescription = strdup((const char *)string);
+    if (!mStorageDescription) return false;
     if (!packet.getString(string)) return false;
     mVolumeIdentifier = strdup((const char *)string);
+    if (!mVolumeIdentifier) return false;
 
     return true;
 }