===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rsync/misc.c,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -c -r1.2 -r1.2.2.1
*** src/usr.bin/rsync/misc.c	2021/03/22 11:14:42	1.2
--- src/usr.bin/rsync/misc.c	2021/11/09 13:41:24	1.2.2.1
***************
*** 1,4 ****
! /* $OpenBSD: misc.c,v 1.2 2021/03/22 11:14:42 claudio Exp $ */
  /*
   * Copyright (c) 2000 Markus Friedl.  All rights reserved.
   * Copyright (c) 2005,2006 Damien Miller.  All rights reserved.
--- 1,4 ----
! /* $OpenBSD: misc.c,v 1.2.2.1 2021/11/09 13:41:24 benno Exp $ */
  /*
   * Copyright (c) 2000 Markus Friedl.  All rights reserved.
   * Copyright (c) 2005,2006 Damien Miller.  All rights reserved.
***************
*** 45,51 ****
  	r = vasprintf(&cp, fmt, ap);
  	va_end(ap);
  	if (r == -1)
! 		err(1, "addargs: argument too long");
  
  	nalloc = args->nalloc;
  	if (args->list == NULL) {
--- 45,51 ----
  	r = vasprintf(&cp, fmt, ap);
  	va_end(ap);
  	if (r == -1)
! 		err(ERR_NOMEM, "addargs: argument too long");
  
  	nalloc = args->nalloc;
  	if (args->list == NULL) {
***************
*** 54,62 ****
  	} else if (args->num+2 >= nalloc)
  		nalloc *= 2;
  
! 	args->list = recallocarray(args->list, args->nalloc, nalloc, sizeof(char *));
  	if (!args->list)
! 		err(1, "malloc");
  	args->nalloc = nalloc;
  	args->list[args->num++] = cp;
  	args->list[args->num] = NULL;
--- 54,63 ----
  	} else if (args->num+2 >= nalloc)
  		nalloc *= 2;
  
! 	args->list = recallocarray(args->list, args->nalloc, nalloc,
! 	    sizeof(char *));
  	if (!args->list)
! 		err(ERR_NOMEM, NULL);
  	args->nalloc = nalloc;
  	args->list[args->num++] = cp;
  	args->list[args->num] = NULL;