Changeset 95088 in webkit

Timestamp:

Sep 14, 2011 6:52:30 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Add NULL checks to ewk_window_features_new_from_core and ewk_view_window_create.
​https://bugs.webkit.org/show_bug.cgi?id=64932

Patch by Grzegorz Czajkowski <​g.czajkowski@samsung.com> on 2011-09-14
Reviewed by Eric Seidel.

It prevents the crash while allocating memory for the new window.

• ewk/ewk_view.cpp:

(ewk_view_window_create):

• ewk/ewk_window_features.cpp:

(ewk_window_features_new_from_core):

Location:

trunk/Source/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• ewk/ewk_view.cpp (modified) (2 diffs)
• ewk/ewk_window_features.cpp (modified) (1 diff)

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2011-09-14  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
+
+        [EFL] Add NULL checks to ewk_window_features_new_from_core and ewk_view_window_create.
+        https://bugs.webkit.org/show_bug.cgi?id=64932
+
+        Reviewed by Eric Seidel.
+
+        It prevents the crash while allocating memory for the new window.
+
+        * ewk/ewk_view.cpp:
+        (ewk_view_window_create):
+        * ewk/ewk_window_features.cpp:
+        (ewk_window_features_new_from_core):
+
 2011-09-13  Raphael Kubo da Costa  <kubo@profusion.mobi>
 

trunk/Source/WebKit/efl/ewk/ewk_view.cpp

@@ -2865 +2865 @@
  *
  * @return New view, in case smart class implements the creation of new windows;
- * else, current view @param o.
+ * else, current view @param o or @c 0 on failure.
  *
  * @see ewk_window_features_ref().
@@ -2877 +2877 @@
 
     Ewk_Window_Features *window_features = ewk_window_features_new_from_core(coreFeatures);
+    if (!window_features)
+        return 0;
+
     Evas_Object* view = sd->api->window_create(sd, javascript, window_features);
     ewk_window_features_unref(window_features);

trunk/Source/WebKit/efl/ewk/ewk_window_features.cpp

@@ -106 +106 @@
  * @param core if not @c 0 a new WebCore::WindowFeatures is allocated copying core features and
  * it is embedded inside the Ewk_Window_Features whose ref count is initialized, if core is @c 0 a new one is created with the default features.
- * @returns a new allocated the Ewk_Window_Features object
+ * @return a new allocated the Ewk_Window_Features object on sucess or @c 0 on failure
  */
 Ewk_Window_Features *ewk_window_features_new_from_core(const WebCore::WindowFeatures *core)
 {
     Ewk_Window_Features *window_features = static_cast<Ewk_Window_Features*>(malloc(sizeof(*window_features)));
+    if (!window_features) {
+        CRITICAL("Could not allocate Ewk_Window_Features.");
+        return 0;
+    }
 
     if (core)