diff --git a/libwvdrmengine/mediacrypto/src_hidl/WVCryptoPlugin.cpp b/libwvdrmengine/mediacrypto/src_hidl/WVCryptoPlugin.cpp
index 61846c01..879bd01d 100644
--- a/libwvdrmengine/mediacrypto/src_hidl/WVCryptoPlugin.cpp
+++ b/libwvdrmengine/mediacrypto/src_hidl/WVCryptoPlugin.cpp
@@ -173,7 +173,10 @@ Return<void> WVCryptoPlugin::decrypt(
       return Void();
     }
 
-    if (destBuffer.offset + destBuffer.size > destBase->getSize()) {
+    size_t totalDstSize = 0;
+    if (__builtin_add_overflow(destBuffer.offset, destBuffer.size, &totalDstSize) ||
+        totalDstSize > destBase->getSize()) {
+      android_errorWriteLog(0x534e4554, "176444622");
       _hidl_cb(Status::ERROR_DRM_CANNOT_HANDLE, 0, "invalid buffer size");
       return Void();
     }