emil/bake
1
0
Fork 0
forked from bake/bake
Code Issues Pull Requests Releases Wiki Activity

fixed bug where find region wouldn't detect a NULL return from map and thus segv'd when suggesting a noexist file would occur

Browse Source
This commit is contained in:
Emil 2023-10-11 11:16:07 +00:00
parent cc398f4746
commit 2a02e5781c
No known key found for this signature in database
GPG Key ID: 5432DB986FDBCF8A
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
baked.c
View File

@ -48,7 +48,7 @@
static char * g_filename, * g_short, * g_all; static char * g_filename, * g_short, * g_all;
static char * static char *
map(const char * fn, size_t * len) map(char * fn, size_t * len)
{ {
struct stat s; struct stat s;
int fd; int fd;
@ -68,10 +68,10 @@ map(const char * fn, size_t * len)
return addr; return addr;
} }
static const char * static char *
find(const char * x, const char * buf, const size_t max, const size_t min) find(char * x, char * buf, size_t max, size_t min)
{ {
const char * start = buf; char * start = buf;
for (; *buf; ++buf) for (; *buf; ++buf)
{ {
if (max - (buf - start) > min && !strncmp(buf, x, min)) if (max - (buf - start) > min && !strncmp(buf, x, min))
@ -81,20 +81,20 @@ find(const char * x, const char * buf, const size_t max, const size_t min)
} }
static char * static char *
find_region(const char * fn) find_region(char * fn)
{ {
size_t len = 0; size_t len = 0;
char * buf = NULL, * addr; char * buf = NULL, * addr;
const char * start, * stop; char * start, * stop;
addr = map(fn, &len); addr = map(fn, &len);
if (addr != MAP_FAILED) if ((ptrdiff_t) addr > 0)
{ {
start = find(START, addr, len, strlen(START)); start = find(START, addr, len, strlen(START));
#ifdef OTHER_START #ifdef OTHER_START
if (!start) if (!start)
{ {
start = find(OTHER_START, addr, len, strlen(OTHER_START)); start = find(OTHER_START, addr, len, strlen(OTHER_START));
start = (const char *) /* DON'T QUESTION IT */ start = (char *) /* DON'T QUESTION IT */
((ptrdiff_t) (start - strlen(START) + strlen(OTHER_START)) * (start != 0)); ((ptrdiff_t) (start - strlen(START) + strlen(OTHER_START)) * (start != 0));
} }
#endif /* OTHER_START */ #endif /* OTHER_START */
@ -163,7 +163,7 @@ root(char * root)
} }
static char * static char *
insert(const char * new, char * str, size_t offset, size_t shift) insert(char * new, char * str, size_t offset, size_t shift)
{ {
size_t len, max; size_t len, max;
local_assert(new, str); local_assert(new, str);
@ -296,7 +296,7 @@ strip(char * buf)
} }
static int static int
run(const char * buf) run(char * buf)
{ {
fputs("Output:\n", stderr); fputs("Output:\n", stderr);
root(g_filename); root(g_filename);