Fixed Infinite Loop Bug

tiffz · Apr 23, 2015 · b894096 · b894096
1 parent 8dab3f5
commit b894096
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/js/generators.js b/js/generators.js
@@ -613,11 +613,13 @@ function makeTest (seed, n) {
     return someChoices(seed + 12, results, n);
 }
 
-function getSeedFromURL(name) {
-    name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
-    var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
-        results = regex.exec(location.search);
-    return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
+function getSeedFromURL() {
+    url = window.location.href;
+    var n = url.lastIndexOf('?s=');
+    if (n == -1 || isNaN(parseInt(url.substring(n + 3)))) {
+        return "";
+    }
+    return url.substring(n + 3);
 }
 
 function ourSponsors(seed) {

diff --git a/js/main.js b/js/main.js
@@ -4,7 +4,7 @@ var complement;
 var navTop;
 var topColor = "#fff";
 var currentSite = window.location.href;
-var gotSeed = getSeedFromURL('s');
+var gotSeed = getSeedFromURL();
 if (gotSeed == "") {
   var newUrl = currentSite + "?s=" + seed;
   location.href = newUrl;