diff -u syslog-ng-2.0.0/debian/changelog syslog-ng-2.0.0/debian/changelog
--- syslog-ng-2.0.0/debian/changelog
+++ syslog-ng-2.0.0/debian/changelog
@@ -1,3 +1,18 @@
+syslog-ng (2.0.0-1ubuntu1.1) gutsy-security; urgency=low
+
+  * SECURITY UPDATE: Allows remote attackers to cause a denial of service
+     (crash) via a message with a timestamp that does not contain a trailing 
+     space, which triggers a NULL pointer dereference.
+  * src/logmsg.c (log_msg_parse): fixed possible NULL pointer dereference
+     in log message parsing, as done in upstream RCS
+  * References:
+    - http://git.balabit.hu/?p=bazsi/syslog-ng-2.0.git;a=commitdiff;h=3126ebad217e7fd6356f4733ca33f571aa87a170
+    - http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-6437
+    - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=457334
+  * Closes lp: #183389
+
+ -- Cody A.W. Somerville <cody-somerville@ubuntu.com>  Tue, 15 Jan 2008 20:21:54 -0400
+
 syslog-ng (2.0.0-1ubuntu1) gutsy; urgency=low
 
   * debian/control:
only in patch2:
unchanged:
--- syslog-ng-2.0.0.orig/src/logmsg.c
+++ syslog-ng-2.0.0/src/logmsg.c
@@ -207,7 +207,10 @@
       
       p = memchr(src, ' ', left);
       
-      stamp_length = (p - src);
+      if (p)
+        stamp_length = (p - src);
+      else
+        stamp_length = left;
       
       g_string_assign_len(self->date, src, stamp_length);
       memset(&tm, 0, sizeof(tm));