===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ipcs/ipcs.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** src/usr.bin/ipcs/ipcs.c	2005/02/22 14:47:45	1.21
--- src/usr.bin/ipcs/ipcs.c	2007/09/02 23:50:04	1.22
***************
*** 1,4 ****
! /*	$OpenBSD: ipcs.c,v 1.21 2005/02/22 14:47:45 jmc Exp $	*/
  /*	$NetBSD: ipcs.c,v 1.25 2000/06/16 03:58:20 simonb Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: ipcs.c,v 1.22 2007/09/02 23:50:04 deraadt Exp $	*/
  /*	$NetBSD: ipcs.c,v 1.25 2000/06/16 03:58:20 simonb Exp $	*/
  
  /*-
***************
*** 718,727 ****
  				errx(1, "kvm_read (%s): %s",
  				    symbols[X_MSQIDS].n_name, kvm_geterr(kd));
  
! 			msqids = malloc(sizeof(struct msqid_ds) *
  			    msginfo.msgmni);
  			if (msqids == NULL)
! 				err(1, "malloc");
  
  			if (kvm_read(kd, addr, msqids,
  			    sizeof(struct msqid_ds) * msginfo.msgmni) !=
--- 718,727 ----
  				errx(1, "kvm_read (%s): %s",
  				    symbols[X_MSQIDS].n_name, kvm_geterr(kd));
  
! 			msqids = calloc(sizeof(struct msqid_ds),
  			    msginfo.msgmni);
  			if (msqids == NULL)
! 				err(1, "calloc");
  
  			if (kvm_read(kd, addr, msqids,
  			    sizeof(struct msqid_ds) * msginfo.msgmni) !=
***************
*** 770,779 ****
  				errx(1, "kvm_read (%s): %s",
  				    symbols[X_SHMSEGS].n_name, kvm_geterr(kd));
  
! 			shmsegs = malloc(sizeof(struct shmid_ds *) *
  			    shminfo.shmmni);
  			if (shmsegs == NULL)
! 				err(1, "malloc");
  
  			if (kvm_read(kd, addr, shmsegs,
  			    sizeof(struct shmid_ds *) * shminfo.shmmni) !=
--- 770,779 ----
  				errx(1, "kvm_read (%s): %s",
  				    symbols[X_SHMSEGS].n_name, kvm_geterr(kd));
  
! 			shmsegs = calloc(sizeof(struct shmid_ds *),
  			    shminfo.shmmni);
  			if (shmsegs == NULL)
! 				err(1, "calloc");
  
  			if (kvm_read(kd, addr, shmsegs,
  			    sizeof(struct shmid_ds *) * shminfo.shmmni) !=
***************
*** 824,833 ****
  				errx(1, "kvm_read (%s): %s",
  				    symbols[X_SEMA].n_name, kvm_geterr(kd));
  
! 			sema = malloc(sizeof(struct semid_ds *) *
  			    seminfo.semmni);
  			if (sema == NULL)
! 				err(1, "malloc");
  
  			if (kvm_read(kd, addr, sema,
  			    sizeof(struct semid_ds *) * seminfo.semmni) !=
--- 824,833 ----
  				errx(1, "kvm_read (%s): %s",
  				    symbols[X_SEMA].n_name, kvm_geterr(kd));
  
! 			sema = calloc(sizeof(struct semid_ds *),
  			    seminfo.semmni);
  			if (sema == NULL)
! 				err(1, "calloc");
  
  			if (kvm_read(kd, addr, sema,
  			    sizeof(struct semid_ds *) * seminfo.semmni) !=