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

Merge "Fixed HLS parsing of bad content IDs." into vic-widevine-dev

Browse Source
This commit is contained in:
Alex Dale
2024-10-03 20:29:46 +00:00
committed by Android (Google) Code Review
parent 2ad9f624b8 380148e3e6
commit 894beae755
2 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libwvdrmengine/cdm/core/src/initialization_data.cpp
View File

@@ -454,8 +454,7 @@ bool InitializationData::ConstructWidevineInitData(
LOGV("Base64 decode of json data failed"); LOGV("Base64 decode of json data failed");
return false; return false;
} }
std::string json_string((const char*)(&json_init_data[0]), const std::string json_string(json_init_data.begin(), json_init_data.end());
json_init_data.size());
// Parse the Json string using jsmn // Parse the Json string using jsmn
jsmn_parser parser; jsmn_parser parser;
@@ -513,12 +512,13 @@ bool InitializationData::ConstructWidevineInitData(
break; break;
case kContentIdState: case kContentIdState:
if (tokens[i].type == JSMN_STRING) { if (tokens[i].type == JSMN_STRING) {
std::string base64_content_id(json_string, tokens[i].start, const std::string base64_content_id = json_string.substr(
tokens[i].end - tokens[i].start); tokens[i].start, tokens[i].end - tokens[i].start);
std::vector<uint8_t> content_id_data = const std::vector<uint8_t> content_id_data =
wvutil::Base64Decode(base64_content_id); wvutil::Base64Decode(base64_content_id);
content_id.assign(reinterpret_cast<const char*>(&content_id_data[0]), if (!content_id_data.empty()) {
content_id_data.size()); content_id.assign(content_id_data.begin(), content_id_data.end());
}
} }
state = kParseState; state = kParseState;
break; break;

23
libwvdrmengine/cdm/core/test/initialization_data_unittest.cpp
View File

@@ -869,4 +869,27 @@ INSTANTIATE_TEST_SUITE_P(
HlsAttributeVariant(kHlsAttributeListInvalidIv, HLS_IV_ATTRIBUTE, HlsAttributeVariant(kHlsAttributeListInvalidIv, HLS_IV_ATTRIBUTE,
kHlsTestHexValueWithOddBytes, false))); kHlsTestHexValueWithOddBytes, false)));
TEST_F(HlsParseTest, BadHlsData_InvalidContentId) {
std::ostringstream hls_uri_json_stream;
hls_uri_json_stream << "{";
hls_uri_json_stream << "\"provider\": \"HlsParseTest.BadHlsData\", ";
// Intentionally bad Base64 content ID.
hls_uri_json_stream << "\"content_id\": \"$$$$\", ";
hls_uri_json_stream << "\"key_ids\": [\"00000000000000000000000000000000\"]";
hls_uri_json_stream << "}";
const std::string hls_uri_json = hls_uri_json_stream.str();
std::ostringstream hls_stream;
hls_stream << "#EXT-X-KEY:";
hls_stream << "METHOD=AES-128,";
hls_stream << "URI=\"data:text/plain;base64,"
<< wvutil::Base64Encode(hls_uri_json) << "\",";
hls_stream << "IV=0x00000000000000000000000000000000,";
hls_stream << "KEYFORMAT=\"com.widevine\",";
hls_stream << "KEYFORMATVERSIONS=\"1\"";
const std::string hls_data = hls_stream.str();
// std::cout << "HLS Data:" << std::endl << hls_data << std::endl;
InitializationData init_data(HLS_INIT_DATA_FORMAT, hls_data);
EXPECT_TRUE(init_data.is_hls());
}
} // namespace wvcdm } // namespace wvcdm