From 78ea3d50e098e392bf3278e740f0c83d6cf771a8 Mon Sep 17 00:00:00 2001 From: "wu@webrtc.org" Date: Mon, 24 Feb 2014 21:51:58 +0000 Subject: [PATCH] Check pcConfig (which can be null) before use. BUG= TEST=manully with pc1.html R=juberti@google.com Review URL: https://webrtc-codereview.appspot.com/9079004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5603 4adac7df-926f-26a2-2b94-8c16560cd09d --- samples/js/base/adapter.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/samples/js/base/adapter.js b/samples/js/base/adapter.js index 8a20ef80e7..3dd894784f 100644 --- a/samples/js/base/adapter.js +++ b/samples/js/base/adapter.js @@ -13,13 +13,15 @@ function trace(text) { console.log((performance.now() / 1000).toFixed(3) + ": " + text); } function maybeFixConfiguration(pcConfig) { + if (pcConfig == null) { + return; + } for (var i = 0; i < pcConfig.iceServers.length; i++) { if (pcConfig.iceServers[i].hasOwnProperty('urls')){ pcConfig.iceServers[i]['url'] = pcConfig.iceServers[i]['urls']; delete pcConfig.iceServers[i]['urls']; } } - return pcConfig; } if (navigator.mozGetUserMedia) { @@ -33,7 +35,7 @@ if (navigator.mozGetUserMedia) { // The RTCPeerConnection object. var RTCPeerConnection = function(pcConfig, pcConstraints) { // .urls is not supported in FF yet. - pcConfig = maybeFixConfiguration(pcConfig); + maybeFixConfiguration(pcConfig); return new mozRTCPeerConnection(pcConfig, pcConstraints); } @@ -165,7 +167,7 @@ if (navigator.mozGetUserMedia) { var RTCPeerConnection = function(pcConfig, pcConstraints) { // .urls is supported since Chrome M34. if (webrtcDetectedVersion < 34) { - pcConfig = maybeFixConfiguration(pcConfig); + maybeFixConfiguration(pcConfig); } return new webkitRTCPeerConnection(pcConfig, pcConstraints); }