From 1e99d93fbecd6b6c2f5feabb16d5da3b14e20075 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@ximian.com>
Date: Thu, 26 Feb 2004 16:40:34 +0000
Subject: Make sure url->path is non-NULL before setting folder_name to
 url->path +

2004-02-26  Jeffrey Stedfast  <fejj@ximian.com>

	* em-utils.c (em_utils_folder_name_from_uri): Make sure url->path
	is non-NULL before setting folder_name to url->path + 1. Could
	possibly fix bug #54853.

svn path=/trunk/; revision=24887
---
 mail/em-utils.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'mail/em-utils.c')

diff --git a/mail/em-utils.c b/mail/em-utils.c
index 4cf0abac4a..24622329f1 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -2484,12 +2484,15 @@ char *
 em_utils_folder_name_from_uri (const char *uri)
 {
 	CamelURL *url;
-	char *folder_name;
+	char *folder_name = NULL;
 	
 	if (uri == NULL || (url = camel_url_new (uri, NULL)) == NULL)
-	    return NULL;
+		return NULL;
 	
-	folder_name = url->fragment ? url->fragment : url->path + 1;
+	if (url->fragment)
+		folder_name = url->fragment;
+	else if (url->path)
+		folder_name = url->path + 1;
 	
 	if (folder_name == NULL) {
 		camel_url_free (url);
-- 
cgit