From cc1df5fe34047a7223cd8ed7745fd3d4c8f3754f Mon Sep 17 00:00:00 2001 From: Jeff Tinker Date: Tue, 17 Aug 2021 04:51:26 +0000 Subject: [PATCH] Fix unaligned access error in oemcrypto_ref Merge from Widevine repo of http://go/wvgerrit/131247 test: opk_all_tests with go/wvgerrit/129283 bug: 193817424 Change-Id: I4dac732a7d2dcbbcdac2d9b445dc87ef71a35349 --- libwvdrmengine/oemcrypto/ref/src/oemcrypto_session.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_session.cpp b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_session.cpp index 880eabd7..fa288e5e 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_session.cpp +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_session.cpp @@ -7,6 +7,7 @@ #include "oemcrypto_session.h" #include + #include #include #include @@ -1858,7 +1859,7 @@ OEMCryptoResult SessionContext::SetDecryptHash(uint32_t frame_number, } compute_hash_ = true; current_frame_number_ = frame_number; - given_hash_ = *reinterpret_cast(hash); + memcpy(&given_hash_, hash, sizeof(uint32_t)); return OEMCrypto_SUCCESS; }