Merged in the security fixes from 2.5.7.

[rsync/rsync.git] / loadparm.c

diff --git a/loadparm.c b/loadparm.c
index 9dc80e7..d9ce157 100644 (file)
--- a/loadparm.c
+++ b/loadparm.c
@@ -441,10 +441,10 @@ static int add_a_service(service *pservice, char *name)
 
   i = iNumServices;
 
 
   i = iNumServices;
 

-  ServicePtrs = (service **)Realloc(ServicePtrs,sizeof(service *)*num_to_alloc);
+  ServicePtrs = realloc_array(ServicePtrs, service *, num_to_alloc);

 
   if (ServicePtrs)
 
   if (ServicePtrs)

-         pSERVICE(iNumServices) = (service *)malloc(sizeof(service));
+         pSERVICE(iNumServices) = new(service);

 
   if (!ServicePtrs || !pSERVICE(iNumServices))
          return(-1);
 
   if (!ServicePtrs || !pSERVICE(iNumServices))
          return(-1);