Merge branch 'master' of git://git.fedorahosted.org/abrt

2 files changed, 2 insertions, 2 deletions

diff --git a/abrt.spec b/abrt.spec
index 256e6fb..55e66fb 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -48,7 +48,7 @@ Development libraries and headers for %{name}.
 Summary: %{name}'s gui
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
-Requires: dbus-python, pygtk2, pygtk2-libglade,gnome-python2-gnomevfs
+Requires: dbus-python, pygtk2, pygtk2-libglade,gnome-python2-gnomevfs, python-sexy
 Provides: abrt-applet = %{version}-%{release}
 Obsoletes: abrt-applet < 0.0.5
 Conflicts: abrt-applet < 0.0.5
diff --git a/lib/Plugins/KerneloopsSysLog.cpp b/lib/Plugins/KerneloopsSysLog.cpp
index 4f720d2..b1171cf 100644
--- a/lib/Plugins/KerneloopsSysLog.cpp
+++ b/lib/Plugins/KerneloopsSysLog.cpp
@@ -181,7 +181,7 @@ int CSysLog::FillLinePointers(char *buffer, size_t buflen)
 		*c9 = '\0'; /* turn the \n into a string termination */
 
 		/* if we see our own marker, we know we submitted everything upto here already */
-		if (memmem(linepointer, len, "Abrt", 4)) {
+		if (len >= 4 && memmem(linepointer, len, "Abrt", 4)) {
 			linecount = 0;
 			lines_info[0].ptr = NULL;
 		}