[epiphany] ephy-bookmarks-import: check for possible NULL deref
- From: Xan Lopez <xan src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [epiphany] ephy-bookmarks-import: check for possible NULL deref
- Date: Thu, 28 Jan 2010 12:59:59 +0000 (UTC)
commit 5b35c0fb711f0d5d7c0d0f29af3d666bb160751d
Author: Xan Lopez <xan gnome org>
Date: Thu Jan 28 14:58:15 2010 +0200
ephy-bookmarks-import: check for possible NULL deref
Spotted by Holger Freyther.
src/bookmarks/ephy-bookmarks-import.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c
index c50027e..1efdb71 100644
--- a/src/bookmarks/ephy-bookmarks-import.c
+++ b/src/bookmarks/ephy-bookmarks-import.c
@@ -97,7 +97,7 @@ ephy_bookmarks_import (EphyBookmarks *bookmarks,
success = ephy_bookmarks_import_xbel (bookmarks, filename);
}
else if ((type != NULL && strcmp (type, "application/x-mozilla-bookmarks") == 0) ||
- strcmp (type, "text/html") == 0 ||
+ (type != NULL && strcmp (type, "text/html") == 0) ||
strstr (filename, MOZILLA_BOOKMARKS_DIR) != NULL ||
strstr (filename, FIREFOX_BOOKMARKS_DIR_0) != NULL ||
strstr (filename, FIREFOX_BOOKMARKS_DIR_1) != NULL ||
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]