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

Merge "Make implicit 64-to-32-bit conversions in core_message_serialize.cpp explicit"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-10-29 18:09:25 +00:00
committed by Android (Google) Code Review
parent 5cdaeab03e 71aaf870c8
commit 1745fbd903
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libwvdrmengine/oemcrypto/odk/src/core_message_serialize.cpp
View File

@@ -56,7 +56,7 @@ bool CreateResponse(uint32_t message_type, const S& core_request,
return false; return false;
} }
uint32_t message_length = ODK_Message_GetSize(&msg); uint32_t message_length = static_cast<uint32_t>(ODK_Message_GetSize(&msg));
msg = ODK_Message_Create(buf.data() + sizeof(header->message_type), msg = ODK_Message_Create(buf.data() + sizeof(header->message_type),
sizeof(header->message_length)); sizeof(header->message_length));
Pack_uint32_t(&msg, &message_length); Pack_uint32_t(&msg, &message_length);
@@ -72,7 +72,7 @@ bool CopyDeviceId(const ODK_ProvisioningRequest& src,
if (request.device_id_length > sizeof(request.device_id)) { if (request.device_id_length > sizeof(request.device_id)) {
return false; return false;
} }
request.device_id_length = device_id.size(); request.device_id_length = static_cast<uint32_t>(device_id.size());
memset(request.device_id, 0, sizeof(request.device_id)); memset(request.device_id, 0, sizeof(request.device_id));
memcpy(request.device_id, device_id.data(), request.device_id_length); memcpy(request.device_id, device_id.data(), request.device_id_length);
return true; return true;