commit 4d9fccf0ae2fa901552af4c9af5b66e539ca723b
author Ashish Kumar Gupta <kumarashishg@google.com> Wed Nov 15 10:28:33 2023 +0000
committer Ashish Kumar Gupta <kumarashishg@google.com> Wed Nov 15 10:28:38 2023 +0000
tree e05745f954d1d5019516a5434e98525a2890afa1
parent 235b91c5c34875ba38c26075d38d7b5b4aa8ce8e

Missing NULL Check

Add a safety NULL check in case of MtpDataPacket::putString() gets called with nullptr as argument.

Bug: 244030143
Change-Id: Ia50e6b4f060a1d9414f89201bf812caa66f1a1cc
Test: presubmit

media/mtp/MtpDataPacket.cpp

diff --git a/media/mtp/MtpDataPacket.cpp b/media/mtp/MtpDataPacket.cpp
index 6068d68..42e9078 100644
--- a/media/mtp/MtpDataPacket.cpp
+++ b/media/mtp/MtpDataPacket.cpp
@@ -420,8 +420,10 @@
 }
 
 void MtpDataPacket::putString(const char* s) {
-    MtpStringBuffer string(s);
-    string.writeToPacket(this);
+    if (s != NULL) {
+        MtpStringBuffer string(s);
+        string.writeToPacket(this);
+    }
 }
 
 void MtpDataPacket::putString(const uint16_t* string) {