diff -Nru synapse-0.2.8.2/debian/changelog synapse-0.2.8.2/debian/changelog --- synapse-0.2.8.2/debian/changelog 2011-11-08 21:41:02.000000000 +0100 +++ synapse-0.2.8.2/debian/changelog 2012-05-28 17:10:21.000000000 +0200 @@ -1,3 +1,11 @@ +synapse (0.2.8.2-1ubuntu1.1) precise-proposed; urgency=low + + * debian/patches: + - 91_check_null_exec.patch: From upstream, don't crash on empty Exec field + (LP: #965564) + + -- Julien Lavergne Mon, 28 May 2012 17:10:15 +0200 + synapse (0.2.8.2-1ubuntu1) precise; urgency=low * Merge from Debian unstable. Ubuntu remaining changes: diff -Nru synapse-0.2.8.2/debian/patches/91_check_null_exec.patch synapse-0.2.8.2/debian/patches/91_check_null_exec.patch --- synapse-0.2.8.2/debian/patches/91_check_null_exec.patch 1970-01-01 01:00:00.000000000 +0100 +++ synapse-0.2.8.2/debian/patches/91_check_null_exec.patch 2012-05-27 20:51:43.000000000 +0200 @@ -0,0 +1,18 @@ +Subject: don't crash on empty Exec field +Origin: http://bazaar.launchpad.net/~synapse-core/synapse-project/trunk/revision/502 + +Index: synapse-0.2.8.2/src/core/desktop-file-service.vala +=================================================================== +--- synapse-0.2.8.2.orig/src/core/desktop-file-service.vala 2011-11-02 17:12:38.000000000 +0100 ++++ synapse-0.2.8.2/src/core/desktop-file-service.vala 2012-05-27 20:51:40.000000000 +0200 +@@ -116,6 +116,10 @@ + + name = keyfile.get_locale_string (GROUP, "Name"); + exec = keyfile.get_string (GROUP, "Exec"); ++ if (exec == null) ++ { ++ throw new DesktopFileError.UNINTERESTING_ENTRY ("Unable to get exec for %s".printf (name)); ++ } + + // check for hidden desktop files + if (keyfile.has_key (GROUP, "Hidden") && diff -Nru synapse-0.2.8.2/debian/patches/series synapse-0.2.8.2/debian/patches/series --- synapse-0.2.8.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ synapse-0.2.8.2/debian/patches/series 2012-05-27 20:48:38.000000000 +0200 @@ -0,0 +1 @@ +91_check_null_exec.patch