[mate-session-manager] 02/04: debian/patches: Add 0004_no-crash-if-no-req-apps-found.patch. Avoid dereferencing NULL pointer, avoid m-s-m crashing if no required applications can be found. (Closes: #778817).

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository mate-session-manager.

commit 3ee84b4c0fcd66d25a68ef935559de6d00ff2ac0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Mar 9 06:08:31 2015 +0100

    debian/patches: Add 0004_no-crash-if-no-req-apps-found.patch. Avoid dereferencing NULL pointer, avoid m-s-m crashing if no required applications can be found. (Closes: #778817).
---
 .../0004_no-crash-if-no-req-apps-found.patch       | 43 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 44 insertions(+)

diff --git a/debian/patches/0004_no-crash-if-no-req-apps-found.patch b/debian/patches/0004_no-crash-if-no-req-apps-found.patch
new file mode 100644
index 0000000..5cda3c5
--- /dev/null
+++ b/debian/patches/0004_no-crash-if-no-req-apps-found.patch
@@ -0,0 +1,43 @@
+
+m 3d54b96a285272cf5ac6a191a1b53ce018305b3e Mon Sep 17 00:00:00 2001
+From: monsta <monsta at inbox.ru>
+Date: Thu, 19 Feb 2015 16:05:52 +0300
+Subject: [PATCH] avoid dereferencing NULL pointer
+
+---
+ mate-session/main.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/mate-session/main.c b/mate-session/main.c
+index 63cc5fc..f5f5734 100644
+--- a/mate-session/main.c
++++ b/mate-session/main.c
+@@ -249,15 +249,16 @@ static void append_required_apps(GsmManager* manager)
+ 	{
+ 		g_warning("No required applications specified");
+ 	}
+-
+-	for (i = 0; required_components[i]; i++)
++	else
+ 	{
++		for (i = 0; required_components[i]; i++)
++		{
+ 			char* default_provider;
+ 			const char* component;
+ 
+ 			if (IS_STRING_EMPTY((char*) required_components[i]))
+ 			{
+-					continue;
++				continue;
+ 			}
+ 
+ 			component = required_components[i];
+@@ -285,6 +286,7 @@ static void append_required_apps(GsmManager* manager)
+ 			}
+ 
+ 			g_free(default_provider);
++		}
+ 	}
+ 
+ 	g_debug("main: *** Done adding required apps");
+
diff --git a/debian/patches/series b/debian/patches/series
index 5458d83..650e93d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 0001_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch
 0002_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch
 0003_set-XDG-CURRENT-DESKTOP-if-empty.patch
+0004_no-crash-if-no-req-apps-found.patch
 1001_hypen-used-as-minus-sign-man-page-fix.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-session-manager.git