Remove some X-Face cruft and check after realloc

diff --git a/src/headerview.c b/src/headerview.c
index 1ea12badb1408410365e4d9b7258c3fbae193a05..2d7074b6a30f34fc365e31920b82bcac4463e3a9 100644 (file)
--- a/src/headerview.c
+++ b/src/headerview.c
@@ -47,10 +47,6 @@
 #include "addrindex.h"
 
 #if HAVE_LIBCOMPFACE
 #include "addrindex.h"
 
 #if HAVE_LIBCOMPFACE

-#define XPM_XFACE_HEIGHT       (HEIGHT + 3)  /* 3 = 1 header + 2 colors */
-
-static gchar *xpm_xface[XPM_XFACE_HEIGHT];
-

 static gint headerview_show_xface      (HeaderView     *headerview,
                                         MsgInfo        *msginfo);
 #endif
 static gint headerview_show_xface      (HeaderView     *headerview,
                                         MsgInfo        *msginfo);
 #endif


@@ -193,17 +189,6 @@ void headerview_init(HeaderView *headerview)
        headerview_set_font(headerview);
        headerview_clear(headerview);
        headerview_set_visibility(headerview, prefs_common.display_header_pane);
        headerview_set_font(headerview);
        headerview_clear(headerview);
        headerview_set_visibility(headerview, prefs_common.display_header_pane);

-
-#if HAVE_LIBCOMPFACE
-       {
-               gint i;
-
-               for (i = 0; i < XPM_XFACE_HEIGHT; i++) {
-                       xpm_xface[i] = g_malloc(WIDTH + 1);
-                       *xpm_xface[i] = '\0';
-               }
-       }
-#endif

 }
 
 void headerview_show(HeaderView *headerview, MsgInfo *msginfo)
 }
 
 void headerview_show(HeaderView *headerview, MsgInfo *msginfo)

diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index f06c88caf315411b791add38d6214082eee53ae9..d30ef72301d839c4888597a3145c79403f592104 100644 (file)
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -947,6 +947,10 @@ void *sgpgme_data_release_and_get_mem(gpgme_data_t data, size_t *len)
        cm_gpgme_data_rewind(data);
        while ((r = gpgme_data_read(data, buf, BUFSIZ)) > 0) {
                result = realloc(result, r + w);
        cm_gpgme_data_rewind(data);
        while ((r = gpgme_data_read(data, buf, BUFSIZ)) > 0) {
                result = realloc(result, r + w);

+               if (result == NULL) {
+                       g_warning("can't allocate memory\n");
+                       return NULL;
+               }

                memcpy(result+w, buf, r);
                w += r;
        }
                memcpy(result+w, buf, r);
                w += r;
        }

diff --git a/src/textview.c b/src/textview.c
index cac63bfae1d3f5e65e97dda1cb8560702beb4dfe..5575bfdecb3e22def0b064638e3c1ac16d470a8e 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -41,10 +41,6 @@
 #  include <compface.h>
 #endif
 
 #  include <compface.h>
 #endif
 

-#if HAVE_LIBCOMPFACE
-#define XPM_XFACE_HEIGHT       (HEIGHT + 3)  /* 3 = 1 header + 2 colors */
-#endif
-

 #include "main.h"
 #include "summaryview.h"
 #include "procheader.h"
 #include "main.h"
 #include "summaryview.h"
 #include "procheader.h"