[webkit-changes] [119999] trunk/Tools

[commit-queue]

Title: [119999] trunk/Tools

Revision

119999

Author

commit-qu...@webkit.org

Date

2012-06-11 12:50:00 -0700 (Mon, 11 Jun 2012)

Log Message

[GTK] Memory leaks in DRT EventSender.cpp
https://bugs.webkit.org/show_bug.cgi?id=88774

Patch by Sudarsana Nagineni <sudarsana.nagin...@linux.intel.com> on 2012-06-11
Reviewed by Martin Robinson.

Fix a few possible memory leaks in EventSender code.

* DumpRenderTree/gtk/EventSender.cpp:
(contextClickCallback): Free the event returned by gdk_event_new().
(mouseDownCallback): Ditto.
(mouseUpCallback): Ditto.

Modified Paths

• trunk/Tools/ChangeLog
• trunk/Tools/DumpRenderTree/gtk/EventSender.cpp

Diff

Modified: trunk/Tools/ChangeLog (119998 => 119999)

--- trunk/Tools/ChangeLog	2012-06-11 19:45:20 UTC (rev 119998)
+++ trunk/Tools/ChangeLog	2012-06-11 19:50:00 UTC (rev 119999)
@@ -1,5 +1,19 @@
 2012-06-11  Sudarsana Nagineni  <sudarsana.nagin...@linux.intel.com>
 
+        [GTK] Memory leaks in DRT EventSender.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=88774
+
+        Reviewed by Martin Robinson.
+
+        Fix a few possible memory leaks in EventSender code.
+
+        * DumpRenderTree/gtk/EventSender.cpp:
+        (contextClickCallback): Free the event returned by gdk_event_new().
+        (mouseDownCallback): Ditto.
+        (mouseUpCallback): Ditto.
+
+2012-06-11  Sudarsana Nagineni  <sudarsana.nagin...@linux.intel.com>
+
         [EFL] REGRESSION (r119788): tests rely on pathToLocalResource are failing after r119788
         https://bugs.webkit.org/show_bug.cgi?id=88661
 

Modified: trunk/Tools/DumpRenderTree/gtk/EventSender.cpp (119998 => 119999)

--- trunk/Tools/DumpRenderTree/gtk/EventSender.cpp	2012-06-11 19:45:20 UTC (rev 119998)
+++ trunk/Tools/DumpRenderTree/gtk/EventSender.cpp	2012-06-11 19:50:00 UTC (rev 119999)
@@ -205,8 +205,10 @@
 {
     GdkEvent* pressEvent = gdk_event_new(GDK_BUTTON_PRESS);
 
-    if (!prepareMouseButtonEvent(pressEvent, 2, 0))
+    if (!prepareMouseButtonEvent(pressEvent, 2, 0)) {
+        gdk_event_free(pressEvent);
         return JSObjectMakeArray(context, 0, 0, 0);
+    }
 
     GdkEvent* releaseEvent = gdk_event_copy(pressEvent);
     sendOrQueueEvent(pressEvent);
@@ -315,12 +317,16 @@
     guint modifiers = argumentCount >= 2 ? gdkModifersFromJSValue(context, arguments[1]) : 0;
 
     GdkEvent* event = gdk_event_new(GDK_BUTTON_PRESS);
-    if (!prepareMouseButtonEvent(event, button, modifiers))
+    if (!prepareMouseButtonEvent(event, button, modifiers)) {
+        gdk_event_free(event);
         return JSValueMakeUndefined(context);
+    }
 
     // If the same mouse button is already in the down position don't send another event as it may confuse Xvfb.
-    if (buttonCurrentlyDown == event->button.button)
+    if (buttonCurrentlyDown == event->button.button) {
+        gdk_event_free(event);
         return JSValueMakeUndefined(context);
+    }
 
     buttonCurrentlyDown = event->button.button;
 
@@ -363,8 +369,10 @@
     guint modifiers = argumentCount >= 2 ? gdkModifersFromJSValue(context, arguments[1]) : 0;
 
     GdkEvent* event = gdk_event_new(GDK_BUTTON_RELEASE);
-    if (!prepareMouseButtonEvent(event, button, modifiers))
+    if (!prepareMouseButtonEvent(event, button, modifiers)) {
+        gdk_event_free(event);
         return JSValueMakeUndefined(context);
+    }
 
     lastClickPositionX = lastMousePositionX;
     lastClickPositionY = lastMousePositionY;

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes