[evolution-patches] [Mailer]Camel Patch fix #321139 for evolution-data-server
- From: jerrypu <Shi Pu Sun COM>
- To: evolution-patches gnome org
- Subject: [evolution-patches] [Mailer]Camel Patch fix #321139 for evolution-data-server
- Date: Thu, 01 Dec 2005 18:01:01 +0800
Dear all,
this patch fix #321139. Evolution would crash because of printing a NULL
pointer receiving from camel_exception_get_description(). If param of
camel_exception_get_description(CamelException *ex) is NULL, this func
would return a NULL pointer. This patch do a change on the return value
and avoid it.
Anybody who can review it for me?
Thanks,
jerry
Index: camel/camel-exception.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-exception.c,v
retrieving revision 1.31
diff -u -p -r1.31 camel-exception.c
--- camel/camel-exception.c 31 Aug 2005 04:21:56 -0000 1.31
+++ camel/camel-exception.c 29 Nov 2005 14:08:14 -0000
@@ -31,6 +31,7 @@
#include "camel-exception.h"
#include "libedataserver/e-memory.h"
+#include "camel-i18n.h"
#include "camel-debug.h"
@@ -303,6 +304,6 @@ camel_exception_get_description (CamelEx
ret = ex->desc;
else
w(g_warning ("camel_exception_get_description called with NULL parameter."));
- return ret;
+ return ret ? ret : (_("No exception description"));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]