X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/459a83c9ccf8cd6a09dea756226246b15a292b28..58cadc8608fbb2cbc7b74578cd92de4337a4b887:/loadparm.c

diff --git a/loadparm.c b/loadparm.c
index 3dcfc4fe..d9ce1577 100644
--- a/loadparm.c
+++ b/loadparm.c
@@ -441,10 +441,10 @@ static int add_a_service(service *pservice, char *name)
 
   i = iNumServices;
 
-  ServicePtrs = (service **)Realloc(ServicePtrs,sizeof(service *)*num_to_alloc);
+  ServicePtrs = realloc_array(ServicePtrs, service *, num_to_alloc);
 
   if (ServicePtrs)
-	  pSERVICE(iNumServices) = (service *)malloc(sizeof(service));
+	  pSERVICE(iNumServices) = new(service);
 
   if (!ServicePtrs || !pSERVICE(iNumServices))
 	  return(-1);
@@ -665,8 +665,8 @@ static BOOL lp_do_parameter(int snum, char *parmname, char *parmvalue)
        string_set(parm_ptr,parmvalue);
        if ((cp = *(char**)parm_ptr) != NULL) {
 	   int len = strlen(cp);
-	   while (len && cp[--len] == '/')
-	       cp[len] = '\0';
+	   while (len > 1 && cp[len-1] == '/') len--;
+	   cp[len] = '\0';
        }
        break;