Patch #:	149
Type:		bug fix
Priority:	low
Affects:	sites using AUFS with files with a bundle for creator 'unix'
Submitted:	Maarten Carels <maarten@fwi.uva.nl>
Archived:	munnari.OZ.AU	mac/cap.patches/cap60.patch149
Application:	'cd cap60; patch -p < cap60.patches/cap60.patch149'
Summary:	check for NULL pointer before dereferencing it
File:		cap60/applications/aufs/afpdt.c

*** applications/aufs/afpdt.c.orig	Tue Feb 16 22:53:40 1993
--- applications/aufs/afpdt.c		Mon Aug  2 21:47:50 1993
***************
*** 1,7 ****
  /*
!  * $Author: djh $ $Date: 1993/02/16 11:53:21 $
!  * $Header: /mac/src/cap60/applications/aufs/RCS/afpdt.c,v 2.6 1993/02/16 11:53:21 djh Rel djh $
!  * $Revision: 2.6 $
  */
  
  /*
--- 1,7 ----
  /*
!  * $Author: djh $ $Date: 1993/08/02 11:47:19 $
!  * $Header: /mac/src/cap60/applications/aufs/RCS/afpdt.c,v 2.7 1993/08/02 11:47:19 djh Rel djh $
!  * $Revision: 2.7 $
  */
  
  /*
***************
*** 1033,1039 ****
        printf("FPAddIcon: trying to reuse old ICON entry\n");
      if (in->in_info.i_bmsize == replaced->in_info.i_bmsize) {
        oldicon = IDFetch(dt->dt_ifd, replaced);
!       if (bcmp((char *)oldicon, (char *)icon, in->in_info.i_bmsize) == 0 &&
  	  bcmp((char *)replaced->in_info.i_ITag,(char *)in->in_info.i_ITag,
  	       ITagSize) == 0) {
  	if (DBDSK)
--- 1033,1040 ----
        printf("FPAddIcon: trying to reuse old ICON entry\n");
      if (in->in_info.i_bmsize == replaced->in_info.i_bmsize) {
        oldicon = IDFetch(dt->dt_ifd, replaced);
!       if (oldicon && bcmp((char *)oldicon, (char *)icon,
! 	in->in_info.i_bmsize) == 0 &&
  	  bcmp((char *)replaced->in_info.i_ITag,(char *)in->in_info.i_ITag,
  	       ITagSize) == 0) {
  	if (DBDSK)
*** lib/cap/abversion.c.orig	Mon Aug  2 20:50:38 1993
--- lib/cap/abversion.c		Mon Aug  2 21:49:26 1993
***************
*** 1,7 ****
  /*
!  * $Author: djh $ $Date: 1993/08/02 10:50:29 $
!  * $Header: /mac/src/cap60/lib/cap/RCS/abversion.c,v 2.48 1993/08/02 10:50:29 djh Rel djh $
!  * $Revision: 2.48 $
  */
  
  /*
--- 1,7 ----
  /*
!  * $Author: djh $ $Date: 1993/08/02 11:49:02 $
!  * $Header: /mac/src/cap60/lib/cap/RCS/abversion.c,v 2.49 1993/08/02 11:49:02 djh Rel djh $
!  * $Revision: 2.49 $
  */
  
  /*
***************
*** 31,37 ****
    myversion.cv_name = "CAP";
    myversion.cv_version = 6;
    myversion.cv_subversion = 0;
!   myversion.cv_patchlevel = 148;
    myversion.cv_rmonth = "August";
    myversion.cv_ryear = "1993";
    switch (lap_proto) {
--- 31,37 ----
    myversion.cv_name = "CAP";
    myversion.cv_version = 6;
    myversion.cv_subversion = 0;
!   myversion.cv_patchlevel = 149;
    myversion.cv_rmonth = "August";
    myversion.cv_ryear = "1993";
    switch (lap_proto) {
*** README.orig		Mon Aug  2 20:52:16 1993
--- README		Mon Aug  2 21:50:31 1993
***************
*** 2,8 ****
  	       CAP - Columbia AppleTalk Package for UNIX
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 148, August 1993
  
  Notice
  ------
--- 2,8 ----
  	       CAP - Columbia AppleTalk Package for UNIX
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 149, August 1993
  
  Notice
  ------