commit 79a02050abe461dbd5597dafc637aee5701f1c81
author Ashish Kumar Gupta <kumarashishg@google.com> Tue Dec 12 05:03:11 2023 +0000
committer Ashish Kumar Gupta <kumarashishg@google.com> Tue Dec 12 05:03:16 2023 +0000
tree 077d095feb08cba85520e2f29704e4d48faecc3b
parent 8d7480e647d0ce61bf0d8991613b4662c95606a3

Missing NULL Check

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

Bug: 313979409
Change-Id: I3ce755dbc87d74aa7d7d392a0d71129096be3f8b
Test: presubmit

media/mtp/MtpDataPacket.cpp

diff --git a/media/mtp/MtpDataPacket.cpp b/media/mtp/MtpDataPacket.cpp
index 42e9078..a2b1c5e 100644
--- a/media/mtp/MtpDataPacket.cpp
+++ b/media/mtp/MtpDataPacket.cpp
@@ -427,6 +427,9 @@
 }
 
 void MtpDataPacket::putString(const uint16_t* string) {
+    if (string == NULL) {
+        return;
+    }
     int count = 0;
     for (int i = 0; i <= MTP_STRING_MAX_CHARACTER_NUMBER; i++) {
         if (string[i])