- djm@cvs.openbsd.org 2006/03/25 00:05:41

     [auth-bsdauth.c auth-skey.c auth.c auth2-chall.c channels.c]
     [clientloop.c deattack.c gss-genr.c kex.c key.c misc.c moduli.c]
     [monitor.c monitor_wrap.c packet.c scard.c sftp-server.c ssh-agent.c]
     [ssh-keyscan.c ssh.c sshconnect.c sshconnect2.c sshd.c uuencode.c]
     [xmalloc.c xmalloc.h]
     introduce xcalloc() and xasprintf() failure-checked allocations
     functions and use them throughout openssh

     xcalloc is particularly important because malloc(nmemb * size) is a
     dangerous idiom (subject to integer overflow) and it is time for it
     to die

     feedback and ok deraadt@

1 files changed, 3 insertions, 14 deletions

diff --git a/moduli.c b/moduli.c
index d53806ea6..f6f15a2a4 100644
--- a/moduli.c
+++ b/moduli.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: moduli.c,v 1.12 2005/07/17 07:17:55 djm Exp $ */
+/* $OpenBSD: moduli.c,v 1.13 2006/03/25 00:05:41 djm Exp $ */
 /*
  * Copyright 1994 Phil Karn <karn@qualcomm.com>
  * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com>
@@ -301,21 +301,10 @@ gen_candidates(FILE *out, u_int32_t memory, u_int32_t power, BIGNUM *start)
                 largewords = (largememory << SHIFT_MEGAWORD);
         }
 
-        TinySieve = calloc(tinywords, sizeof(u_int32_t));
-        if (TinySieve == NULL) {
-                error("Insufficient memory for tiny sieve: need %u bytes",
-                    tinywords << SHIFT_BYTE);
-                exit(1);
-        }
+        TinySieve = xcalloc(tinywords, sizeof(u_int32_t));
         tinybits = tinywords << SHIFT_WORD;
 
-        SmallSieve = calloc(smallwords, sizeof(u_int32_t));
-        if (SmallSieve == NULL) {
-                error("Insufficient memory for small sieve: need %u bytes",
-                    smallwords << SHIFT_BYTE);
-                xfree(TinySieve);
-                exit(1);
-        }
+        SmallSieve = xcalloc(smallwords, sizeof(u_int32_t));
         smallbits = smallwords << SHIFT_WORD;
 
         /*