media/webm/webm_content_encodings_client.cc - Issue 10826098: Use std::string for decryption key ID in webm parser.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/webm/webm_content_encodings_client.cc

Issue 10826098: Use std::string for decryption key ID in webm parser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 8 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: media/webm/webm_content_encodings_client.cc

diff --git a/media/webm/webm_content_encodings_client.cc b/media/webm/webm_content_encodings_client.cc

index a24b4bfa672946cdfbc8a475bbb709b104b391ef..2541e0b84eadd599dbc22350b5c1d87ca74475fe 100644

--- a/media/webm/webm_content_encodings_client.cc

+++ b/media/webm/webm_content_encodings_client.cc

@@ -248,8 +248,7 @@ bool WebMContentEncodingsClient::OnBinary(int id, const uint8* data, int size) {

DCHECK_GT(size, 0);

if (id == kWebMIdContentEncKeyID) {

- if (cur_content_encoding_->encryption_key_id() ||

- cur_content_encoding_->encryption_key_id_size()) {

+ if (!cur_content_encoding_->encryption_key_id().empty()) {

DVLOG(1) << "Unexpected multiple ContentEncKeyID";

return false;

}