Source/modules/crypto/SubtleCrypto.cpp - Issue 20582003: WebCrypto: Fix a crash when passing invalid ArrayBufferView to importKey.

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: Source/modules/crypto/SubtleCrypto.cpp

Issue 20582003: WebCrypto: Fix a crash when passing invalid ArrayBufferView to importKey. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 7 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: Source/modules/crypto/SubtleCrypto.cpp

diff --git a/Source/modules/crypto/SubtleCrypto.cpp b/Source/modules/crypto/SubtleCrypto.cpp

index 608b516c82d583ca7713606ddddbf800a78b3fd5..28a9e6d6cfcdbf5b06b8a7380f6e34c7f58ed06d 100644

--- a/Source/modules/crypto/SubtleCrypto.cpp

+++ b/Source/modules/crypto/SubtleCrypto.cpp

@@ -125,6 +125,11 @@ ScriptObject SubtleCrypto::importKey(const String& rawFormat, ArrayBufferView* k

return ScriptObject();

}

+ if (!keyData) {

+ es.throwDOMException(TypeError);

+ return ScriptObject();

+ }

WebKit::WebCryptoKeyUsageMask keyUsages;

if (!Key::parseUsageMask(rawKeyUsages, keyUsages)) {

es.throwDOMException(TypeError);