aboutsummaryrefslogtreecommitdiffstats
path: root/src/bookmarks
diff options
context:
space:
mode:
authorXan Lopez <xan@gnome.org>2010-01-28 20:58:15 +0800
committerXan Lopez <xan@gnome.org>2010-01-28 20:58:15 +0800
commit5b35c0fb711f0d5d7c0d0f29af3d666bb160751d (patch)
tree370eb1884b38bdf71a3680a9a8fc76b9333f9e48 /src/bookmarks
parentc229ec7e467856c6a831a31e810bea3b3e202c6a (diff)
downloadgsoc2013-epiphany-5b35c0fb711f0d5d7c0d0f29af3d666bb160751d.tar
gsoc2013-epiphany-5b35c0fb711f0d5d7c0d0f29af3d666bb160751d.tar.gz
gsoc2013-epiphany-5b35c0fb711f0d5d7c0d0f29af3d666bb160751d.tar.bz2
gsoc2013-epiphany-5b35c0fb711f0d5d7c0d0f29af3d666bb160751d.tar.lz
gsoc2013-epiphany-5b35c0fb711f0d5d7c0d0f29af3d666bb160751d.tar.xz
gsoc2013-epiphany-5b35c0fb711f0d5d7c0d0f29af3d666bb160751d.tar.zst
gsoc2013-epiphany-5b35c0fb711f0d5d7c0d0f29af3d666bb160751d.zip
ephy-bookmarks-import: check for possible NULL deref
Spotted by Holger Freyther.
Diffstat (limited to 'src/bookmarks')
-rw-r--r--src/bookmarks/ephy-bookmarks-import.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c
index c50027e7c..1efdb71de 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 ||