commit 20d68e02bc8909bda1f00c176de9aa1a91a3c5da
author Marco Nelissen <marcone@google.com> Mon Feb 13 23:30:14 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 13 23:30:14 2017 +0000
tree e924f0b4984a7aa710539b7470f58d360422dfa4
parent 60721afe7bf23a6febd83135b592f75b751d7f94
parent f70b522d31f5a85855cd2801364ea42208546346

resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am: 24058e96b3 am: c9d4267bf0 am: 199f36c95a am: fb800b98ed
am: f70b522d31

Change-Id: Iae87f698c8b8a46de2d578767883b6ee0c7b4ed3

media/libstagefright/wifi-display/rtp/RTPSender.cpp

diff --git a/media/libstagefright/wifi-display/rtp/RTPSender.cpp b/media/libstagefright/wifi-display/rtp/RTPSender.cpp
index c66a898..83af393 100644
--- a/media/libstagefright/wifi-display/rtp/RTPSender.cpp
+++ b/media/libstagefright/wifi-display/rtp/RTPSender.cpp
@@ -762,10 +762,16 @@
     return OK;
 }
 
-status_t RTPSender::parseAPP(const uint8_t *data, size_t size __unused) {
-    if (!memcmp("late", &data[8], 4)) {
-        int64_t avgLatencyUs = (int64_t)U64_AT(&data[12]);
-        int64_t maxLatencyUs = (int64_t)U64_AT(&data[20]);
+status_t RTPSender::parseAPP(const uint8_t *data, size_t size) {
+    static const size_t late_offset = 8;
+    static const char late_string[] = "late";
+    static const size_t avgLatencyUs_offset = late_offset + sizeof(late_string) - 1;
+    static const size_t maxLatencyUs_offset = avgLatencyUs_offset + sizeof(int64_t);
+
+    if ((size >= (maxLatencyUs_offset + sizeof(int64_t)))
+            && !memcmp(late_string, &data[late_offset], sizeof(late_string) - 1)) {
+        int64_t avgLatencyUs = (int64_t)U64_AT(&data[avgLatencyUs_offset]);
+        int64_t maxLatencyUs = (int64_t)U64_AT(&data[maxLatencyUs_offset]);
 
         sp<AMessage> notify = mNotify->dup();
         notify->setInt32("what", kWhatInformSender);