From 476da255421908122b00a1154a329afada89e32c Mon Sep 17 00:00:00 2001
From: "cbiesinger%web.de"
 <cbiesinger%web.de@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 28 Mar 2002 21:17:18 +0000
Subject: [PATCH] bug 124242 r=timeless sr=alecf a=asa about.html doesn't
 handle empty useragent

git-svn-id: svn://10.0.0.236/trunk@117690 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpfe/global/resources/locale/en-US/about.html  | 8 ++++++--
 mozilla/xpfe/global/resources/locale/en-US/about.xhtml | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/mozilla/xpfe/global/resources/locale/en-US/about.html b/mozilla/xpfe/global/resources/locale/en-US/about.html
index 1680761c2f4..75ba63baa39 100644
--- a/mozilla/xpfe/global/resources/locale/en-US/about.html
+++ b/mozilla/xpfe/global/resources/locale/en-US/about.html
@@ -71,8 +71,12 @@ h1 {
 <a id="mozlink" href="http://www.mozilla.org/releases/">Mozilla </a>
 </h1>
 <script type="application/x-javascript">
-  document.getElementById("mozlink").firstChild.appendData(navigator.userAgent.match(/rv:([^;)]+)/)[1]);
-  document.getElementById("mozver").appendChild(document.createTextNode(navigator.userAgent));
+  // using try..catch to handle empty useragents and other cases where the regex fails to apply
+  try {
+    document.getElementById("mozver").appendChild(document.createTextNode(navigator.userAgent));
+    document.getElementById("mozlink").firstChild.appendData(navigator.userAgent.match(/rv:([^;)]+)/)[1]);
+  }
+  catch (e) {}
 </script>
 </td>
 
diff --git a/mozilla/xpfe/global/resources/locale/en-US/about.xhtml b/mozilla/xpfe/global/resources/locale/en-US/about.xhtml
index 1680761c2f4..75ba63baa39 100644
--- a/mozilla/xpfe/global/resources/locale/en-US/about.xhtml
+++ b/mozilla/xpfe/global/resources/locale/en-US/about.xhtml
@@ -71,8 +71,12 @@ h1 {
 <a id="mozlink" href="http://www.mozilla.org/releases/">Mozilla </a>
 </h1>
 <script type="application/x-javascript">
-  document.getElementById("mozlink").firstChild.appendData(navigator.userAgent.match(/rv:([^;)]+)/)[1]);
-  document.getElementById("mozver").appendChild(document.createTextNode(navigator.userAgent));
+  // using try..catch to handle empty useragents and other cases where the regex fails to apply
+  try {
+    document.getElementById("mozver").appendChild(document.createTextNode(navigator.userAgent));
+    document.getElementById("mozlink").firstChild.appendData(navigator.userAgent.match(/rv:([^;)]+)/)[1]);
+  }
+  catch (e) {}
 </script>
 </td>