Bug#260197: marked as done (PATCH: fix NULL filename assertions)

Debian Bug Tracking System owner@bugs.debian.org
Thu, 20 Jan 2005 00:18:16 -0800


Your message dated Thu, 20 Jan 2005 09:15:46 +0100
with message-id <20050120081546.GA19715@bugs.debian.org>
and subject line PATCH: fix NULL filename assertions
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--------------------------------------
Received: (at submit) by bugs.debian.org; 19 Jul 2004 09:48:02 +0000
>From pmoulder@bowman.csse.monash.edu.au Mon Jul 19 02:48:02 2004
Return-path: <pmoulder@bowman.csse.monash.edu.au>
Received: from alpha8.its.monash.edu.au [130.194.1.8] 
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1BmUkc-0000GO-00; Mon, 19 Jul 2004 02:48:02 -0700
Received: from localhost ([130.194.13.88]) by vaxh.its.monash.edu.au
 (PMDF V5.2-31 #39306)
 with ESMTP id <01LCNOEFEZU28WWGC3@vaxh.its.monash.edu.au> for
 submit@bugs.debian.org; Mon, 19 Jul 2004 19:47:02 +1000
Received: from moe.its.monash.edu.au (localhost.localdomain [127.0.0.1])
	by localhost (Postfix) with ESMTP id 1E98DAB542	for <submit@bugs.debian.org>;
 Mon, 19 Jul 2004 19:47:02 +1000 (EST)
Received: from nexus.csse.monash.edu.au
 (nexus.csse.monash.edu.au [130.194.64.4])	by moe.its.monash.edu.au (Postfix)
 with ESMTP id 045084FB03	for <submit@bugs.debian.org>; Mon,
 19 Jul 2004 19:47:02 +1000 (EST)
Received: from bowman.csse.monash.edu.au
 (mail@bowman.csse.monash.edu.au [130.194.226.120])	by nexus.csse.monash.edu.au
 (8.12.8+Sun/8.12.8) with ESMTP id i6J9l1TL026373	for <submit@bugs.debian.org>;
 Mon, 19 Jul 2004 19:47:01 +1000 (EST)
Received: from pmoulder by bowman.csse.monash.edu.au with local
 (Exim 3.36 #1 (Debian))	id 1BmUjW-0007eo-00; Mon, 19 Jul 2004 19:46:54 +1000
Date: Mon, 19 Jul 2004 19:46:54 +1000
From: Peter Moulder <pmoulder@bowman.csse.monash.edu.au>
Subject: PATCH: fix NULL filename assertions
To: Debian Bug Tracking System <submit@bugs.debian.org>
Message-id: <E1BmUjW-0007eo-00@bowman.csse.monash.edu.au>
MIME-version: 1.0
X-Mailer: reportbug 2.62
Content-type: text/plain; charset=us-ascii
Content-transfer-encoding: 7BIT
Delivered-To: submit@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE 
	autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 

Package: gedit
Version: 2.6.1-1
Severity: minor


The attached patch is taken straight from gedit-2.7.1.
Consider upgrading gedit to >= 2.7.1 as an alternative
to applying this patch.

pjrm.


diff -dur gedit-2.6.1/gedit/recent-files/egg-recent-util.c gedit-2.7.1/gedit/recent-files/egg-recent-util.c
--- gedit-2.6.1/gedit/recent-files/egg-recent-util.c	2004-02-14 05:06:26.000000000 +1100
+++ gedit-2.7.1/gedit/recent-files/egg-recent-util.c	2004-06-26 00:47:02.000000000 +1000
@@ -53,6 +53,7 @@
 	return g_string_free (str, FALSE);
 }
 
+#ifndef USE_STABLE_LIBGNOMEUI
 static GdkPixbuf *
 scale_icon (GdkPixbuf *pixbuf,
 	    double *scale)
@@ -105,7 +106,6 @@
 	return pixbuf;
 }
 
-#ifndef USE_STABLE_LIBGNOMEUI
 GdkPixbuf *
 egg_recent_util_get_icon (GnomeIconTheme *theme, const gchar *uri,
 			  const gchar *mime_type, int size)
@@ -128,6 +128,10 @@
 						 &base_size);
 	g_free (icon);
 
+	if (filename == NULL) {
+		return NULL;
+	}
+
 	pixbuf = load_icon_file (filename, base_size, size);
 	g_free (filename);
 	

---------------------------------------
Received: (at 260197-done) by bugs.debian.org; 20 Jan 2005 08:15:49 +0000
>From lool@bee.dooz.org Thu Jan 20 00:15:49 2005
Return-path: <lool@bee.dooz.org>
Received: from postfix4-1.free.fr [213.228.0.62] 
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1CrXTo-0001q1-00; Thu, 20 Jan 2005 00:15:49 -0800
Received: from bee.dooz.org (levallois.dooz.org [81.57.180.178])
	by postfix4-1.free.fr (Postfix) with ESMTP id 69AD9271085;
	Thu, 20 Jan 2005 09:15:47 +0100 (CET)
Received: by bee.dooz.org (Postfix, from userid 1000)
	id A568B6809D9C; Thu, 20 Jan 2005 09:15:46 +0100 (CET)
Date: Thu, 20 Jan 2005 09:15:46 +0100
From: =?iso-8859-1?Q?Lo=EFc?= Minier <lool@dooz.org>
To: Peter Moulder <pmoulder@bowman.csse.monash.edu.au>,
	260197-done@bugs.debian.org
Subject: Re: PATCH: fix NULL filename assertions
Message-ID: <20050120081546.GA19715@bugs.debian.org>
References: <E1BmUjW-0007eo-00@bowman.csse.monash.edu.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
In-Reply-To: <E1BmUjW-0007eo-00@bowman.csse.monash.edu.au>
Content-Transfer-Encoding: quoted-printable
Delivered-To: 260197-done@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-3.0 required=4.0 tests=BAYES_00 autolearn=no 
	version=2.60-bugs.debian.org_2005_01_02
X-Spam-Level: 

        Hi,

 This is a followup for Debian bug <http://bugs.debian.org/260197>.

Peter Moulder <pmoulder@bowman.csse.monash.edu.au> - Mon, Jul 19, 2004:

> Consider upgrading gedit to >=3D 2.7.1 as an alternative
> to applying this patch.

 Since Debian sarge now has 2.8.2-1, I understand it is no longer
 necessary to integrate this patch and I'm closing this bug.

   Regards,

--=20
Lo=EFc Minier <lool@dooz.org>
"Neutral President: I have no strong feelings one way or the other."