Title: [100135] trunk/Source/WebCore
Revision
100135
Author
[email protected]
Date
2011-11-14 06:03:24 -0800 (Mon, 14 Nov 2011)

Log Message

Web Inspector: [regression r99960] null callback access.
https://bugs.webkit.org/show_bug.cgi?id=72263

Reviewed by Yury Semikhatsky.

* inspector/CodeGeneratorInspector.py:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (100134 => 100135)


--- trunk/Source/WebCore/ChangeLog	2011-11-14 13:19:29 UTC (rev 100134)
+++ trunk/Source/WebCore/ChangeLog	2011-11-14 14:03:24 UTC (rev 100135)
@@ -1,3 +1,12 @@
+2011-11-14  Pavel Feldman  <[email protected]>
+
+        Web Inspector: [regression r99960] null callback access.
+        https://bugs.webkit.org/show_bug.cgi?id=72263
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/CodeGeneratorInspector.py:
+
 2011-11-14  Tor Arne Vestbø  <[email protected]>
 
         [Qt] Unbreak the build on Mac OS X

Modified: trunk/Source/WebCore/inspector/CodeGeneratorInspector.py (100134 => 100135)


--- trunk/Source/WebCore/inspector/CodeGeneratorInspector.py	2011-11-14 13:19:29 UTC (rev 100134)
+++ trunk/Source/WebCore/inspector/CodeGeneratorInspector.py	2011-11-14 14:03:24 UTC (rev 100135)
@@ -1085,23 +1085,22 @@
             }
 
             var callback = this._callbacks[messageObject.id];
-
-            var arguments = [];
-            if (messageObject.result) {
-                var paramNames = this._replyArgs[callback.methodName];
-                if (paramNames) {
-                    for (var i = 0; i < paramNames.length; ++i)
-                        arguments.push(messageObject.result[paramNames[i]]);
+            if (callback) {
+                var argumentsArray = [];
+                if (messageObject.result) {
+                    var paramNames = this._replyArgs[callback.methodName];
+                    if (paramNames) {
+                        for (var i = 0; i < paramNames.length; ++i)
+                            argumentsArray.push(messageObject.result[paramNames[i]]);
+                    }
                 }
-            }
 
-            if (callback) {
                 var processingStartTime;
                 if (this.dumpInspectorTimeStats && callback.methodName)
                     processingStartTime = Date.now();
 
-                arguments.unshift(messageObject.error);
-                callback.apply(null, arguments);
+                argumentsArray.unshift(messageObject.error);
+                callback.apply(null, argumentsArray);
                 --this._pendingResponsesCount;
                 delete this._callbacks[messageObject.id];
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to