From 708c3f8b864812abc1c9642f65bc284d4bd3f074 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Tue, 12 Feb 2013 23:21:49 -0800
Subject: Make path parsing more robust in the JsonStore.

---
 .../OptionalModules/Scripting/JsonStore/JsonStore.cs   | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
index 3bad06c..f7625fb 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
@@ -68,14 +68,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         protected List<TakeValueCallbackClass> m_TakeStore;
         protected List<TakeValueCallbackClass> m_ReadStore;
         
-        // add separators for quoted paths
-        protected static Regex m_ParsePassOne = new Regex("{[^}]+}");
-
-        // add separators for array references
-        protected static Regex m_ParsePassTwo = new Regex("(\\[[0-9]+\\]|\\[\\+\\])");
+        // add separators for quoted paths and array references
+        protected static Regex m_ParsePassOne = new Regex("({[^}]+}|\\[[0-9]+\\]|\\[\\+\\])");
 
         // add quotes to bare identifiers which are limited to alphabetic characters
-        protected static Regex m_ParsePassThree = new Regex("\\.([a-zA-Z]+)");
+        protected static Regex m_ParsePassThree = new Regex("(?<!{[^}]*)\\.([a-zA-Z]+)(?=\\.)");
 
         // remove extra separator characters
         protected static Regex m_ParsePassFour = new Regex("\\.+");
@@ -84,7 +81,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         protected static Regex m_ValidatePath = new Regex("^\\.(({[^}]+}|\\[[0-9]+\\]|\\[\\+\\])\\.)*$");
 
         // expression used to match path components
-        protected static Regex m_PathComponent = new Regex("\\.({[^}]+}|\\[[0-9]+\\]|\\[\\+\\]+)");
+        protected static Regex m_PathComponent = new Regex("\\.({[^}]+}|\\[[0-9]+\\]|\\[\\+\\])");
 
         // extract the internals of an array reference
         protected static Regex m_SimpleArrayPattern = new Regex("\\[([0-9]+)\\]");
@@ -465,11 +462,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             // add front and rear separators
             expr = "." + expr + ".";
             
-            // add separators for quoted exprs
-            expr = m_ParsePassOne.Replace(expr,".$0.",-1,0);
-                
-            // add separators for array references
-            expr = m_ParsePassTwo.Replace(expr,".$0.",-1,0);
+            // add separators for quoted exprs and array references
+            expr = m_ParsePassOne.Replace(expr,".$1.",-1,0);
                 
             // add quotes to bare identifier
             expr = m_ParsePassThree.Replace(expr,".{$1}",-1,0);
-- 
cgit v1.1