[tbb-commits] [torbutton/master] Bug #15207: Check first if bridge.ID exists before using it

[gk at torproject.org]

commit 9714d5a8abfcc19c6c5667a8c4e3b7d064401df0
Author: Arthur Edelstein <arthuredelstein at gmail.com>
Date:   Mon Mar 9 17:24:05 2015 -0700

    Bug #15207: Check first if bridge.ID exists before using it
---
 src/chrome/content/tor-circuit-display.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js
index e2628b4..bcda03a 100644
--- a/src/chrome/content/tor-circuit-display.js
+++ b/src/chrome/content/tor-circuit-display.js
@@ -55,7 +55,7 @@ let trimQuotes = s => s ? s.match(/^\"(.*)\"$/)[1] : undefined;
 let getBridge = function* (controller, id) {
   let bridges = yield controller.getConf("bridge");
   for (let bridge of bridges) {
-    if (bridge.ID.toUpperCase() === id.toUpperCase()) {
+    if (bridge.ID && bridge.ID.toUpperCase() === id.toUpperCase()) {
       return bridge;
     }
   }