Index: trunk/src/trustfile.c
===================================================================
--- trunk/src/trustfile.c	(revision 481)
+++ trunk/src/trustfile.c	(revision 592)
@@ -437,4 +437,6 @@
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETGRGID_R)
   buffer = calloc(1,SH_GRBUF_SIZE);
+  if (!buffer)
+     goto end_false;
   status = sh_getgrgid_r(grp, &gr, buffer, SH_GRBUF_SIZE, &g);
 #else
@@ -456,4 +458,6 @@
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETGRGID_R)
   pbuffer = calloc(1,SH_PWBUF_SIZE);
+  if (!pbuffer)
+     goto end_false;
 #endif
 
@@ -550,4 +554,8 @@
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETGRGID_R)
   buffer = calloc(1,SH_GRBUF_SIZE);
+  if (!buffer) {
+    retval = S_FALSE;
+    goto end_retval;
+  }
   status = sh_getgrgid_r(grp, &gr, buffer, SH_GRBUF_SIZE, &g);
 #else
@@ -581,4 +589,8 @@
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
   pbuffer = calloc(1,SH_PWBUF_SIZE);
+  if (!pbuffer) {
+    retval = S_FALSE;
+    goto end_retval;
+  }
 #endif