widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix unaligned access error in oemcrypto_ref

Browse Source 
Merge from Widevine repo of http://go/wvgerrit/131247

test: opk_all_tests with go/wvgerrit/129283
bug: 193817424
Change-Id: I4dac732a7d2dcbbcdac2d9b445dc87ef71a35349
This commit is contained in:
Jeff Tinker
2021-08-17 04:51:26 +00:00
committed by Fred Gylys-Colwell
parent df6ea9e21e
commit cc1df5fe34
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libwvdrmengine/oemcrypto/ref/src/oemcrypto_session.cpp
View File

@@ -7,6 +7,7 @@
#include "oemcrypto_session.h" #include "oemcrypto_session.h"
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include <algorithm> #include <algorithm>
#include <iostream> #include <iostream>
@@ -1858,7 +1859,7 @@ OEMCryptoResult SessionContext::SetDecryptHash(uint32_t frame_number,
} }
compute_hash_ = true; compute_hash_ = true;
current_frame_number_ = frame_number; current_frame_number_ = frame_number;
given_hash_ = *reinterpret_cast<const uint32_t*>(hash); memcpy(&given_hash_, hash, sizeof(uint32_t));
return OEMCrypto_SUCCESS; return OEMCrypto_SUCCESS;
} }