bug #19803 [WebProfilerBundle] Fix infinite loop in JS (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 03a824a1170f · 2016-09-01T12:01:16.000+02:00
This PR was merged into the 3.2-dev branch. Discussion ---------- [WebProfilerBundle] Fix infinite loop in JS | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes (master only) | Tests pass? | yes | License | MIT For some reason, I ended up having this while loop infinitely. Commits ------- 68b6c32 [WebProfilerBundle] Fix infinite loop in JS
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig
@@ -16,8 +16,11 @@
             function(xhr, el) {
 
                 /* Evaluate embedded scripts inside the toolbar */
-                var rx=/<script>(.*?)<\/script>/g, s;
-                while (s = rx.exec(el.innerHTML)) {eval(s[1]);};
+                var i, scripts = [].slice.call(el.querySelectorAll('script'));
+
+                for (i = 0; i < scripts.length; ++i) {
+                    eval(scripts[i].firstChild.nodeValue);
+                }
 
                 el.style.display = -1 !== xhr.responseText.indexOf('sf-toolbarreset') ? 'block' : 'none';
 
@@ -38,8 +41,8 @@
                 Sfjs.renderAjaxRequests();
 
                 /* Handle toolbar-info position */
-                var toolbarBlocks = document.querySelectorAll('.sf-toolbar-block');
-                for (var i = 0; i < toolbarBlocks.length; i += 1) {
+                var toolbarBlocks = [].slice.call(el.querySelectorAll('.sf-toolbar-block'));
+                for (i = 0; i < toolbarBlocks.length; ++i) {
                     toolbarBlocks[i].onmouseover = function () {
                         var toolbarInfo = this.querySelectorAll('.sf-toolbar-info')[0];
                         var pageWidth = document.body.clientWidth;
