sync with main 0.9.11cvs1

[claws.git] / src / msgcache.c

diff --git a/src/msgcache.c b/src/msgcache.c
index 6273f54cce56681902638a7797992f86e0f2f9e5..0a3c956744012449ee52cea557fe5c33029c61db 100644 (file)
--- a/src/msgcache.c
+++ b/src/msgcache.c
@@ -84,7 +84,7 @@ void msgcache_add_msg(MsgCache *cache, MsgInfo *msginfo)
        cache->memusage += procmsg_msginfo_memusage(msginfo);
        cache->last_access = time(NULL);
 
        cache->memusage += procmsg_msginfo_memusage(msginfo);
        cache->last_access = time(NULL);
 

-       debug_print("Cache size: %d messages, %d byte\n", g_hash_table_size(cache->msgnum_table), cache->memusage);
+       debug_print("Cache size: %d messages, %d bytes\n", g_hash_table_size(cache->msgnum_table), cache->memusage);

 }
 
 void msgcache_remove_msg(MsgCache *cache, guint msgnum)
 }
 
 void msgcache_remove_msg(MsgCache *cache, guint msgnum)


@@ -215,20 +215,28 @@ gint msgcache_get_memory_usage(MsgCache *cache)
 
 #define READ_CACHE_DATA_INT(n, fp) \
 { \
 
 #define READ_CACHE_DATA_INT(n, fp) \
 { \

-       if (fread(&n, sizeof(n), 1, fp) != 1) { \
+       guint32 idata; \
+ \
+       if (fread(&idata, sizeof(idata), 1, fp) != 1) { \

                g_warning("Cache data is corrupted\n"); \
                procmsg_msginfo_free(msginfo); \
                error = TRUE; \
                break; \
                g_warning("Cache data is corrupted\n"); \
                procmsg_msginfo_free(msginfo); \
                error = TRUE; \
                break; \

-       } \
+       } else \
+               n = idata;\

 }
 
 }
 

-#define WRITE_CACHE_DATA_INT(n, fp) \
-       fwrite(&n, sizeof(n), 1, fp)
+#define WRITE_CACHE_DATA_INT(n, fp)            \
+{                                              \
+       guint32 idata;                          \
+                                               \
+       idata = (guint32)n;                     \
+       fwrite(&idata, sizeof(idata), 1, fp);   \
+}

 
 #define WRITE_CACHE_DATA(data, fp) \
 { \
 
 #define WRITE_CACHE_DATA(data, fp) \
 { \

-       gint len; \
+       size_t len; \

        if (data == NULL) \
                len = 0; \
        else \
        if (data == NULL) \
                len = 0; \
        else \


@@ -297,10 +305,10 @@ static gint msgcache_read_cache_data_str(FILE *fp, gchar **str)
 {
        gchar buf[BUFFSIZE];
        gint ret = 0;
 {
        gchar buf[BUFFSIZE];
        gint ret = 0;

-       size_t len;
+       guint32 len;

 
        if (fread(&len, sizeof(len), 1, fp) == 1) {
 
        if (fread(&len, sizeof(len), 1, fp) == 1) {

-               if (len < 0)
+               if (len > G_MAXINT)

                        ret = -1;
                else {
                        gchar *tmp = NULL;
                        ret = -1;
                else {
                        gchar *tmp = NULL;