cleanup: Replace a few calls to malloc/realloc with safe_malloc

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/ipaddr.c b/ipaddr.c
index 09eb80d..e6d2407 100644 (file)
--- a/ipaddr.c
+++ b/ipaddr.c
@@ -35,10 +35,7 @@ static void subnet_list_set_len(struct subnet_list *a, int32_t l)
     if (l>a->alloc) {
        assert(a->alloc < (int)(INT_MAX/sizeof(*nd))-EXTEND_ALLOC_BY);
        na=a->alloc+EXTEND_ALLOC_BY;
-       nd=realloc(a->list,sizeof(*nd)*na);
-       if (!nd) {
-           fatal_perror("subnet_list_set_len: realloc");
-       }
+       nd=safe_realloc_ary(a->list,sizeof(*nd),na,"subnet_list_set_len");
        a->alloc=na;
        a->list=nd;
     }
@@ -120,10 +117,7 @@ static void ipset_set_len(struct ipset *a, int32_t l)
     if (l>a->a) {
        assert(a->a < INT_MAX-EXTEND_ALLOC_BY);
        na=a->a+EXTEND_ALLOC_BY;
-       nd=realloc(a->d,sizeof(*nd)*na);
-       if (!nd) {
-           fatal_perror("ipset_set_len: realloc");
-       }
+       nd=safe_realloc_ary(a->d,sizeof(*nd),na,"ipset_set_len");
        a->a=na;
        a->d=nd;
     }

diff --git a/site.c b/site.c
index 3ac2372..935bf38 100644 (file)
--- a/site.c
+++ b/site.c
@@ -520,9 +520,10 @@ static void set_new_transform(struct site *st, char *pk)
     assert(st->sharedsecretlen);
     if (st->sharedsecretlen > st->sharedsecretallocd) {
        st->sharedsecretallocd=st->sharedsecretlen;
-       st->sharedsecret=realloc(st->sharedsecret,st->sharedsecretallocd);
+       st->sharedsecret=safe_realloc_ary(st->sharedsecret,1,
+                                         st->sharedsecretallocd,
+                                         "site:sharedsecret");
     }
-    if (!st->sharedsecret) fatal_perror("site:sharedsecret");
 
     /* Generate the shared key */
     st->dh->makeshared(st->dh->st,st->dhsecret,st->dh->len,pk,

diff --git a/transform-cbcmac.c b/transform-cbcmac.c
index 1390ee8..fac8649 100644 (file)
--- a/transform-cbcmac.c
+++ b/transform-cbcmac.c
@@ -336,7 +336,7 @@ void transform_cbcmac_module(dict_t *dict)
        const char *errmsg;
        int i;
 
-       tr = malloc(sizeof(struct transform));
+       tr = safe_malloc(sizeof(struct transform),"test transform");
        tr->max_seq_skew = 20;
        ti = transform_create(tr);