commit 2c9cb62d0160fc4353d89fd9d648725794e7995e
author George Burgess IV <gbiv@google.com> Mon Feb 29 13:39:17 2016 -0800
committer George Burgess IV <gbiv@google.com> Wed Mar 02 15:30:00 2016 -0800
tree 878ce3c89496086115698f7fda491cbd5c32594d
parent 88b79848634d3cf379e87e5565f8fb4331875b53

Cleanup uses of sprintf so we can deprecate it.

Also removes a seemingly useless branch.

Change-Id: Icd61d4facd64985f4c73e9876569e1ae1a74ee83

media/mtp/MtpPacket.cpp

diff --git a/media/mtp/MtpPacket.cpp b/media/mtp/MtpPacket.cpp
index 35ecb4f..3dd4248 100644
--- a/media/mtp/MtpPacket.cpp
+++ b/media/mtp/MtpPacket.cpp
@@ -70,8 +70,8 @@
     char* bufptr = buffer;
 
     for (size_t i = 0; i < mPacketSize; i++) {
-        sprintf(bufptr, "%02X ", mBuffer[i]);
-        bufptr += strlen(bufptr);
+        bufptr += snprintf(bufptr, sizeof(buffer) - (bufptr - buffer), "%02X ",
+                           mBuffer[i]);
         if (i % DUMP_BYTES_PER_ROW == (DUMP_BYTES_PER_ROW - 1)) {
             ALOGV("%s", buffer);
             bufptr = buffer;