d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent stack-smashing buffer overflows in -D and -r options by using

Browse Source 
buffer-safe string functions.  The rest of the code is still probably
unsafe.

MFC after:	1 week
This commit is contained in:
kris 2002-10-13 01:18:33 +00:00
parent 010f2e9171
commit cf195c5ed6
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnu/usr.bin/patch/common.h
View File

@ -29,9 +29,12 @@
#define Fclose (void)fclose
#define Fflush (void)fflush
#define Sprintf (void)sprintf
#define Snprintf (void)snprintf
#define Mktemp (void)mktemp
#define Strcpy (void)strcpy
#define Strcat (void)strcat
#define Strlcpy (void)strlcpy
#define Strlcat (void)strlcat
/* NeXT declares malloc and realloc incompatibly from us in some of
these files. Temporarily redefine them to prevent errors. */

13
gnu/usr.bin/patch/patch.c
View File

@ -90,6 +90,7 @@ char rcsid[] =
*
*/
#include <paths.h>
#include "INTERN.h"
#include "common.h"
#include "EXTERN.h"
@ -166,7 +167,7 @@ char **argv;
tmpdir = getenv ("TMPDIR");
if (tmpdir == NULL) {
tmpdir = "/tmp";
tmpdir = _PATH_TMP;
}
tmpname_len = strlen (tmpdir) + 20;
@ -387,7 +388,7 @@ char **argv;
if (failed) {
failtotal += failed;
if (!*rejname) {
Strcpy(rejname, outname);
Strlcpy(rejname, outname, sizeof(rejname));
addext(rejname, ".rej", '#');
}
if (skip_rest_of_patch) {
@ -524,9 +525,9 @@ get_some_switches(void)
do_defines = TRUE;
if (!isalpha((unsigned char)*optarg) && '_' != *optarg)
fatal1("argument to -D is not an identifier\n");
Sprintf(if_defined, "#ifdef %s\n", optarg);
Sprintf(not_defined, "#ifndef %s\n", optarg);
Sprintf(end_defined, "#endif /* %s */\n", optarg);
Snprintf(if_defined, sizeof(if_defined), "#ifdef %s\n", optarg);
Snprintf(not_defined, sizeof(not_defined), "#ifndef %s\n", optarg);
Snprintf(end_defined, sizeof(end_defined), "#endif /* %s */\n", optarg);
break;
case 'e':
diff_type = ED_DIFF;
@ -565,7 +566,7 @@ get_some_switches(void)
strippath = 0;
break;
case 'r':
Strcpy(rejname, optarg);
Strlcpy(rejname, optarg, sizeof(rejname));
break;
case 'R':
reverse = TRUE;