qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-17 01:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Close a potential buffer overflow.

Browse source
This commit is contained in:
Bill Currie 2011-03-09 11:09:46 +09:00
parent 4d90eba2ad
commit 8368f57fbf
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tools/qfcc/include/options.h
View file

@ -89,6 +89,7 @@ typedef struct {
int strip_path; // number of leading path elements to strip
// from source file names
const char *output_file;
const char *debug_file;
} options_t;
extern options_t options;

28
tools/qfcc/source/qfcc.c
View file

@ -95,8 +95,6 @@ options_t options;
const char *sourcedir;
const char *progs_src;
char debugfile[1024];
pr_info_t pr;
#ifdef _WIN32
@ -270,8 +268,8 @@ WriteSym (pr_debug_header_t *sym, int size)
locals[i].s_name = LittleLong (locals[i].s_name);
}
if (!(h = Qopen (debugfile, "wb")))
Sys_Error ("%s: %s\n", debugfile, strerror(errno));
if (!(h = Qopen (options.debug_file, "wb")))
Sys_Error ("%s: %s\n", options.debug_file, strerror(errno));
Qwrite (h, sym, size);
Qclose (h);
@ -307,22 +305,26 @@ static void
setup_sym_file (const char *output_file)
{
if (options.code.debug) {
char *s;
dstring_t *str = dstring_strdup (output_file);
const char *s;
int offset;
strcpy (debugfile, output_file);
s = debugfile + strlen (debugfile);
while (s-- > debugfile) {
s = str->str + strlen (str->str);
while (s-- > str->str) {
if (*s == '.')
break;
if (*s == '/' || *s == '\\') {
s = debugfile + strlen (debugfile);
s = str->str + strlen (str->str);
break;
}
}
strcpy (s, ".sym");
offset = s - str->str;
str->size = offset + 5;
dstring_adjust (str);
strcpy (str->str + offset, ".sym");
options.debug_file = save_string (str->str);
if (options.verbosity >= 1)
printf ("debug file: %s\n", debugfile);
printf ("debug file: %s\n", options.debug_file);
}
}
@ -381,7 +383,7 @@ finish_link (void)
int str;
setup_sym_file (options.output_file);
str = linker_add_string (debugfile);
str = linker_add_string (options.debug_file);
linker_add_def (".debug_file", &type_string, flags, str);
}