Changeset 121752 in webkit

Timestamp:

Jul 3, 2012 3:04:12 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] [WK2] Don't call eina_iterator_free() if iterator is NULL
​https://bugs.webkit.org/show_bug.cgi?id=90076

Patch by Sudarsana Nagineni <​sudarsana.nagineni@linux.intel.com> on 2012-07-03
Reviewed by Kenneth Rohde Christiansen.

Add a null check to prevent calling eina_iterator_free() when
iterator is NULL.

No new tests. This patch doesn't change behavior.

• platform/efl/FileSystemEfl.cpp:

(WebCore::listDirectory): Early return when iterator is NULL.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/efl/FileSystemEfl.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-03  Sudarsana Nagineni  <sudarsana.nagineni@linux.intel.com>
+
+        [EFL] [WK2] Don't call eina_iterator_free() if iterator is NULL
+        https://bugs.webkit.org/show_bug.cgi?id=90076
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Add a null check to prevent calling eina_iterator_free() when
+        iterator is NULL.
+
+        No new tests. This patch doesn't change behavior.
+
+        * platform/efl/FileSystemEfl.cpp:
+        (WebCore::listDirectory): Early return when iterator is NULL.
+
 2012-07-03  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/Source/WebCore/platform/efl/FileSystemEfl.cpp

@@ -92 +92 @@
 
     Eina_Iterator* it = eina_file_ls(path.utf8().data());
+    // FIXME: Early return if the iterator is null to avoid error messages from eina_iterator_free().
+    // This check can be removed once the magic check on _free() removed in Eina.
+    // http://www.mail-archive.com/enlightenment-devel@lists.sourceforge.net/msg42944.html
+    if (!it)
+        return matchingEntries;
+
     EINA_ITERATOR_FOREACH(it, f_name) {
         if (!fnmatch(cfilter.data(), f_name, 0))