Fix integer overflow in mediadrmserver

bug:37710346 Change-Id: If18cfb5bb1d1f1b2997d2a0e1685590d674181f4 (cherry picked from commit eb21712)
TheFlyhalf205 · Aug 21, 2017 · 01ac669 · 01ac669
1 parent 085e785
commit 01ac669
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drm/mediadrm/plugins/clearkey/InitDataParser.cpp b/drm/mediadrm/plugins/clearkey/InitDataParser.cpp
@@ -109,7 +109,7 @@ android::status_t InitDataParser::parsePssh(const Vector<uint8_t>& initData,
     memcpy(&keyIdCount, &initData[readPosition], sizeof(keyIdCount));
     keyIdCount = ntohl(keyIdCount);
     readPosition += sizeof(keyIdCount);
-    if (readPosition + (keyIdCount * kKeyIdSize) !=
+    if (readPosition + ((uint64_t)keyIdCount * kKeyIdSize) !=
             initData.size() - sizeof(uint32_t)) {
         return android::ERROR_DRM_CANNOT_HANDLE;
     }