commit d36832a813c8a1aadcc671e99808f475a160bc22
author Jeff Tinker <jtinker@google.com> Fri Sep 23 16:01:52 2016 -0700
committer Jeff Tinker <jtinker@google.com> Fri Sep 23 16:01:52 2016 -0700
tree 928b6be98157f98291c253aeda0667f0c70be2ab
parent 2cc3afc8a5d70910e2c0e4c04c41393ff1e7effc

Fix potential heap data leak in mediadrmserver

Change-Id: Ife4cecaeb5e301d702681c6dba9a17357232db40
related-to-bug: 31657897

media/libmedia/ICrypto.cpp

diff --git a/media/libmedia/ICrypto.cpp b/media/libmedia/ICrypto.cpp
index 495e3f9..302e6ee 100644
--- a/media/libmedia/ICrypto.cpp
+++ b/media/libmedia/ICrypto.cpp
@@ -373,7 +373,7 @@
                     // data back via the shared buffer rather than
                     // copying it separately over binder to avoid
                     // binder's 1MB limit.
-                    memcpy(sharedBuffer->pointer(), dstPtr, totalSize);
+                    memcpy(sharedBuffer->pointer(), dstPtr, result);
                 }
                 free(dstPtr);
                 dstPtr = NULL;