From b4b62fc8360a51d000313fc18be2ac5ad645bfa9 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 23 Mar 2009 12:36:05 +0000
Subject: [PATCH] Fix #141 by not splitting URLs on quoted commas.

Added a new function util.splitLiteral(str, RegExp).
---
 common/content/util.js | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/common/content/util.js b/common/content/util.js
index ad41bd18..8ea3d22a 100644
--- a/common/content/util.js
+++ b/common/content/util.js
@@ -249,6 +249,40 @@ const util = { //{{{
         return delimiter + str.replace(/([\\'"])/g, "\\$1").replace("\n", "\\n", "g").replace("\t", "\\t", "g") + delimiter;
     },
 
+    /**
+     * Split a string on literal occurances of a marker.
+     *
+     * Specifically this ignores occurences preceded by a backslash, or
+     * contained within 'single' or "double" quotes.
+     *
+     * It assumes backslash escaping on strings, and will thus not count quotes
+     * that are preceded by a backslash or within other quotes as starting or
+     * ending quoted sections of the string.
+     *
+     * @param {string} str
+     * @param {RegExp} marker
+     */
+    splitLiteral: function splitLiteral(str, marker)
+    {
+        let results = [];
+        let resep = RegExp(/^(([^\\'"]|\\.|'([^\\']|\\.)*'|"([^\\"]|\\.)*")*?)/.source + marker.source);
+        let cont = true;
+
+        while (cont)
+        {
+            cont = false;
+            str = str.replace(resep, function (match, before)
+            {
+                results.push(before);
+                cont = true;
+                return "";
+            });
+        }
+
+        results.push(str);
+        return results;
+    },
+
     /**
      * Converts <b>bytes</b> to a pretty printed data size string.
      *
@@ -618,7 +652,7 @@ const util = { //{{{
      */
     stringToURLArray: function stringToURLArray(str)
     {
-        let urls = str.split(RegExp("\\s*" + options["urlseparator"] + "\\s*"));
+        let urls = util.splitLiteral(str, RegExp("\\s*" + options["urlseparator"] + "\\s*"));
 
         return urls.map(function (url) {
             try