evolution-data-server r9248 - in trunk/camel: . providers/local

[sragavan svn gnome org]

Author: sragavan
Date: Sun Aug  3 16:22:24 2008
New Revision: 9248
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9248&view=rev

Log:
2008-08-03  Srinivasa Ragavan  <sragavan novell com>

	* camel/camel-folder-summary.c: Fix pstring crash issues.
2008-08-03  Srinivasa Ragavan  <sragavan novell com>

	* camel/providers/local/camel-maildir-summary.c: Fix pstring crashes.


Modified:
   trunk/camel/ChangeLog
   trunk/camel/camel-folder-summary.c
   trunk/camel/providers/local/ChangeLog
   trunk/camel/providers/local/camel-maildir-summary.c

Modified: trunk/camel/camel-folder-summary.c
==============================================================================
--- trunk/camel/camel-folder-summary.c	(original)
+++ trunk/camel/camel-folder-summary.c	Sun Aug  3 16:22:24 2008
@@ -1543,8 +1543,7 @@
 		d(printf ("Trying to insert message with clashing uid (%s).  new uid re-assigned", camel_message_info_uid (info)));
 
 		camel_pstring_free (info->uid);
-		uid = info->uid = camel_folder_summary_next_uid_string(s);
-
+		uid = info->uid = camel_pstring_add (camel_folder_summary_next_uid_string(s), TRUE);
 		camel_message_info_set_flags(info, CAMEL_MESSAGE_FOLDER_FLAGGED, CAMEL_MESSAGE_FOLDER_FLAGGED);
 
 		CAMEL_SUMMARY_LOCK(s, summary_lock);

Modified: trunk/camel/providers/local/camel-maildir-summary.c
==============================================================================
--- trunk/camel/providers/local/camel-maildir-summary.c	(original)
+++ trunk/camel/providers/local/camel-maildir-summary.c	Sun Aug  3 16:22:24 2008
@@ -41,7 +41,7 @@
 #include "camel-mime-message.h"
 #include "camel-operation.h"
 #include "camel-private.h"
-
+#include "camel-string-utils.h"
 #include "camel-maildir-summary.h"
 
 #define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
@@ -285,7 +285,7 @@
 
 		uid = camel_message_info_uid(mi);
 		if (uid==NULL || uid[0] == 0)
-			mdi->info.info.uid = camel_folder_summary_next_uid_string(s);
+			mdi->info.info.uid = camel_pstring_add (camel_folder_summary_next_uid_string(s), TRUE);
 
 		/* handle 'duplicates' */
 		info = camel_folder_summary_uid(s, uid);