[MinGW-cvs] msys/rt/src/winsup/cygwin ChangeLog.MSYS,1.17,1.18 shared.cc,1.3,1.4 msys.cc,1.2,1.3

[<ea...@us...>]

Update of /cvsroot/mingw/msys/rt/src/winsup/cygwin
In directory usw-pr-cvs1:/tmp/cvs-serv16168

Modified Files:
	ChangeLog.MSYS shared.cc msys.cc 
Log Message:

	* msys.cc: Add guards for pointers returned by strrchr throughout.
	* shared.cc (shared_name): Add guard to check pointer of return from
	strchr.
	Thanks to Luke Dunstan for both of the above.



Index: ChangeLog.MSYS
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/ChangeLog.MSYS,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ChangeLog.MSYS	13 Jun 2002 21:54:21 -0000	1.17
--- ChangeLog.MSYS	19 Jun 2002 12:23:00 -0000	1.18
***************
*** 1,2 ****
--- 1,9 ----
+ 2002-06-19  Earnie Boyd  <ea...@us...>
+ 
+ 	* msys.cc: Add guards for pointers returned by strrchr throughout.
+ 	* shared.cc (shared_name): Add guard to check pointer of return from
+ 	strchr.
+ 	Thanks to Luke Dunstan for both of the above.
+ 
  2002-06-13  Earnie Boyd  <ea...@us...>
  

Index: shared.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/shared.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shared.cc	13 Jun 2002 21:54:21 -0000	1.3
--- shared.cc	19 Jun 2002 12:23:00 -0000	1.4
***************
*** 47,55 ****
    static NO_COPY char buf2[MAX_PATH] = {0};
    extern bool _cygwin_testing;
  
    //FIXME: This should be based on where the DLL actually is located.
    AbsDllPath("msys-1.0.dll", buf2, MAX_PATH);
    strcpy(buf2, &buf2[3]);
!   *(strchr(buf2, '\\')) = '\0';
    debug_printf("buf2 = %s", buf2);
    __small_sprintf (buf, "%s.%s.%s.%d", buf2, cygwin_version.shared_id, str, num);
--- 47,58 ----
    static NO_COPY char buf2[MAX_PATH] = {0};
    extern bool _cygwin_testing;
+   char *tptr;
  
    //FIXME: This should be based on where the DLL actually is located.
    AbsDllPath("msys-1.0.dll", buf2, MAX_PATH);
    strcpy(buf2, &buf2[3]);
!   tptr = strchr(buf2, '\\');
!   if (tptr)
!     *tptr = '\0';
    debug_printf("buf2 = %s", buf2);
    __small_sprintf (buf, "%s.%s.%s.%d", buf2, cygwin_version.shared_id, str, num);

Index: msys.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/msys.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** msys.cc	24 Apr 2002 12:47:53 -0000	1.2
--- msys.cc	19 Jun 2002 12:23:00 -0000	1.3
***************
*** 33,37 ****
        {
  	char *ptr = strrchr(AbsDllPath, '\\');
! 	*ptr = '\0';
        }
  }
--- 33,38 ----
        {
  	char *ptr = strrchr(AbsDllPath, '\\');
! 	if (ptr)
! 	  *ptr = '\0';
        }
  }
***************
*** 54,58 ****
        {
  	char *ptr = strrchr(AbsExeModPath, '\\');
! 	*ptr = '\0';
        }
  }
--- 55,60 ----
        {
  	char *ptr = strrchr(AbsExeModPath, '\\');
! 	if (ptr)
! 	  *ptr = '\0';
        }
  }