Changeset 1393

Timestamp:

09/09/09 11:58:37 (15 years ago)

Author:

rodsouza

Message:

Ticket #611 - Alterada a busca de chaves utilizada no 'unserialize'

File:

• trunk/contactcenter/js/ccAux.js (modified) (2 diffs)

trunk/contactcenter/js/ccAux.js

@@ -217 +217 @@
         {
                 var nOpen, nClose = iniPos;
-                
-                do 
+                var startIn = nClose + 1;
+
+                do
                 {
-                        nOpen = str.indexOf('{', nClose+1);
-                        nClose = str.indexOf('}', nClose+1);
+                        startIn = nClose + 1;
+                        do
+                        {
+                                nOpen = str.indexOf( '{', startIn );
+                                var escapeEndIn = str.indexOf( '";', nOpen + 1 );
+                                var escapeBeginIn = str.indexOf( ':"', nOpen + 1 );
+                                if ( escapeEndIn < escapeBeginIn )
+                                        startIn = nOpen + 1;
+                        }
+                        while ( escapeEndIn < escapeBeginIn );
+
+                        startIn = nClose + 1;
+                        do
+                        {
+                                nClose = str.indexOf( '}', startIn );
+                                var escapeEndIn = str.indexOf( '";', nClose + 1 );
+                                var escapeBeginIn = str.indexOf( ':"', nClose + 1 );
+                                if ( escapeEndIn < escapeBeginIn )
+                                        startIn = nClose + 1;
+                        }
+                        while ( escapeEndIn < escapeBeginIn );
 
                         if (nOpen == -1)
@@ -227 +247 @@
                                 return nClose;
                         }
-                        
+
                         if (nOpen < nClose )
                         {
                                 nClose = matchBracket(str, nOpen);
                         }
-                        
+
                 } while (nOpen < nClose);