===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/m4/gnum4.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -c -r1.25 -r1.26
*** src/usr.bin/m4/gnum4.c	2003/06/30 22:13:32	1.25
--- src/usr.bin/m4/gnum4.c	2003/11/17 17:12:10	1.26
***************
*** 1,4 ****
! /* $OpenBSD: gnum4.c,v 1.25 2003/06/30 22:13:32 espie Exp $ */
  
  /*
   * Copyright (c) 1999 Marc Espie
--- 1,4 ----
! /* $OpenBSD: gnum4.c,v 1.26 2003/11/17 17:12:10 espie Exp $ */
  
  /*
   * Copyright (c) 1999 Marc Espie
***************
*** 212,220 ****
  			bufsize = 1024;
  		else
  			bufsize *= 2;
! 		buffer = realloc(buffer, bufsize);
! 		if (buffer == NULL)
! 			errx(1, "out of memory");
  	}
  	memcpy(buffer+current, c, n);
  	current += n;
--- 212,218 ----
  			bufsize = 1024;
  		else
  			bufsize *= 2;
! 		buffer = xrealloc(buffer, bufsize, NULL);
  	}
  	memcpy(buffer+current, c, n);
  	current += n;
***************
*** 228,236 ****
  			bufsize = 1024;
  		else
  			bufsize *= 2;
! 		buffer = realloc(buffer, bufsize);
! 		if (buffer == NULL)
! 			errx(1, "out of memory");
  	}
  	buffer[current++] = c;
  }
--- 226,232 ----
  			bufsize = 1024;
  		else
  			bufsize *= 2;
! 		buffer = xrealloc(buffer, bufsize, NULL);
  	}
  	buffer[current++] = c;
  }
***************
*** 251,257 ****
  	char 	*errbuf;
  
  	errlen = regerror(er, re, NULL, 0);
! 	errbuf = xalloc(errlen);
  	regerror(er, re, errbuf, errlen);
  	errx(1, "%s at line %lu: regular expression error: %s", 
  	    CURRENT_NAME, CURRENT_LINE, errbuf);
--- 247,254 ----
  	char 	*errbuf;
  
  	errlen = regerror(er, re, NULL, 0);
! 	errbuf = xalloc(errlen, 
! 	    "malloc in regerror: %lu", (unsigned long)errlen);
  	regerror(er, re, errbuf, errlen);
  	errx(1, "%s at line %lu: regular expression error: %s", 
  	    CURRENT_NAME, CURRENT_LINE, errbuf);
***************
*** 458,464 ****
  		if (error != 0)
  			exit_regerror(error, &re);
  		
! 		pmatch = xalloc(sizeof(regmatch_t) * (re.re_nsub+1));
  		do_subst(argv[2], &re, 
  		    argc > 4 && argv[4] != NULL ? argv[4] : "", pmatch);
  		free(pmatch);
--- 455,461 ----
  		if (error != 0)
  			exit_regerror(error, &re);
  		
! 		pmatch = xalloc(sizeof(regmatch_t) * (re.re_nsub+1), NULL);
  		do_subst(argv[2], &re, 
  		    argc > 4 && argv[4] != NULL ? argv[4] : "", pmatch);
  		free(pmatch);
***************
*** 483,489 ****
  	if (error != 0)
  		exit_regerror(error, &re);
  	
! 	pmatch = xalloc(sizeof(regmatch_t) * (re.re_nsub+1));
  	if (argv[4] == NULL || argc == 4)
  		do_regexpindex(argv[2], &re, pmatch);
  	else
--- 480,486 ----
  	if (error != 0)
  		exit_regerror(error, &re);
  	
! 	pmatch = xalloc(sizeof(regmatch_t) * (re.re_nsub+1), NULL);
  	if (argv[4] == NULL || argc == 4)
  		do_regexpindex(argv[2], &re, pmatch);
  	else