| Index: third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp
|
| diff --git a/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp b/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp
|
| index c58565ae8451b22e0c1cf7e6c2920d0058897b31..2bc5aaa750f8ca1a70b2e71604aeccb131bfed48 100644
|
| --- a/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp
|
| +++ b/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp
|
| @@ -850,7 +850,7 @@ ScriptPromise RTCPeerConnection::generateCertificate(
|
| Nullable<DOMTimeStamp> expires;
|
| if (keygenAlgorithm.isDictionary()) {
|
| Dictionary keygenAlgorithmDict = keygenAlgorithm.getAsDictionary();
|
| - if (keygenAlgorithmDict.hasProperty("expires")) {
|
| + if (keygenAlgorithmDict.hasProperty("expires", exceptionState)) {
|
| v8::Local<v8::Value> expiresValue;
|
| keygenAlgorithmDict.get("expires", expiresValue);
|
| if (expiresValue->IsNumber()) {
|
| @@ -864,6 +864,9 @@ ScriptPromise RTCPeerConnection::generateCertificate(
|
| }
|
| }
|
| }
|
| + if (exceptionState.hadException()) {
|
| + return ScriptPromise();
|
| + }
|
|
|
| // Convert from WebCrypto representation to recognized WebRTCKeyParams. WebRTC
|
| // supports a small subset of what are valid AlgorithmIdentifiers.
|
|
|