Use safe_calloc to initialize memory, simplify size_t overflow check

diff --git a/hcache/lmdb.c b/hcache/lmdb.c
index f0aa0cd50c68e3c0476afd1235d62d5828b5ed6d..435daf88aabd401785437d3494765c6248c84cc1 100644 (file)
--- a/hcache/lmdb.c
+++ b/hcache/lmdb.c
@@ -108,9 +108,7 @@ static void *hcache_lmdb_open(const char *path)
 {
   int rc;
 
-  struct HcacheLmdbCtx *ctx = safe_malloc(sizeof(struct HcacheLmdbCtx));
-  ctx->txn = NULL;
-  ctx->db = 0;
+  struct HcacheLmdbCtx *ctx = safe_calloc(1, sizeof(struct HcacheLmdbCtx));
 
   rc = mdb_env_create(&ctx->env);
   if (rc != MDB_SUCCESS)

diff --git a/lib/memory.c b/lib/memory.c
index 89e7a62498d51300976614b8d9677703f786ff6d..6e98e59f240da7d6aa137c261d67deaa8a1f953e 100644 (file)
--- a/lib/memory.c
+++ b/lib/memory.c
@@ -37,6 +37,7 @@
  */
 
 #include "config.h"
+#include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include "memory.h"
@@ -61,7 +62,7 @@ void *safe_calloc(size_t nmemb, size_t size)
   if (!nmemb || !size)
     return NULL;
 
-  if (((size_t) -1) / nmemb <= size)
+  if (nmemb > (SIZE_MAX / size))
   {
     mutt_error(_("Integer overflow -- can't allocate memory!"));
     sleep(1);