Changeset 93606 in webkit

Timestamp:

Aug 23, 2011 8:48:55 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Treat the case of WebCore::History->currentItem() returning NULL.
​https://bugs.webkit.org/show_bug.cgi?id=66698

Patch by Raphael Kubo da Costa <​kubo@profusion.mobi> on 2011-08-23
Reviewed by Kenneth Rohde Christiansen.

WebCore::History->currentItem() may return NULL, and we'd better treat
it in ewk_history_history_item_current_get itself than propagate the
issue to _ewk_history_item_new.

• ewk/ewk_history.cpp:

(ewk_history_history_item_current_get):

• ewk/ewk_history.h:

Location:

trunk/Source/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• ewk/ewk_history.cpp (modified) (1 diff)
• ewk/ewk_history.h (modified) (1 diff)

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2011-08-23  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        [EFL] Treat the case of WebCore::History->currentItem() returning NULL.
+        https://bugs.webkit.org/show_bug.cgi?id=66698
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        WebCore::History->currentItem() may return NULL, and we'd better treat
+        it in ewk_history_history_item_current_get itself than propagate the
+        issue to _ewk_history_item_new.
+
+        * ewk/ewk_history.cpp:
+        (ewk_history_history_item_current_get):
+        * ewk/ewk_history.h:
+
 2011-08-23  Raphael Kubo da Costa  <kubo@profusion.mobi>
 

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

@@ -154 +154 @@
 {
     EWK_HISTORY_CORE_GET_OR_RETURN(history, core, 0);
-    return _ewk_history_item_new(core->currentItem());
+    WebCore::HistoryItem *currentItem = core->currentItem();
+    if (currentItem)
+        return _ewk_history_item_new(currentItem);
+    return 0;
 }
 

trunk/Source/WebKit/efl/ewk/ewk_history.h

@@ -111 +111 @@
  * @param history which history instance to query.
  *
- * @return the @b newly allocated item instance. This memory must be
- *         released with ewk_history_item_free() after use.
+ * @return the @b newly allocated item instance or @c NULL on error. This memory
+ *         must be released with ewk_history_item_free() after use.
  */
 EAPI Ewk_History_Item *ewk_history_history_item_current_get(const Ewk_History *history);