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

Memory edgecase fixed

Browse Source
This commit is contained in:
Emil 2023-10-16 19:16:46 +00:00
parent 322ae7976e
commit 14e00b68ce
No known key found for this signature in database
GPG Key ID: 5432DB986FDBCF8A
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bake.c
View File

@ -162,7 +162,7 @@ find_region(map_t m) {
fprintf(stderr, "ERROR: Found start without suffix spacing.\n"); fprintf(stderr, "ERROR: Found start without suffix spacing.\n");
return buf; return buf;
} }
#endif #endif /* REQUIRE_SPACE */
stop = find(STOP, start, start + m.len - (start - m.str)); stop = find(STOP, start, start + m.len - (start - m.str));
if (!stop) { if (!stop) {
stop = start; stop = start;
@ -174,14 +174,13 @@ find_region(map_t m) {
} }
} }
#ifdef REQUIRE_SPACE #ifdef REQUIRE_SPACE
else { else if (!isspace(*(stop - 1))) {
if (!isspace(*(stop - 1))) { fprintf(stderr, "ERROR: Found stop without prefixing spacing.\n");
fprintf(stderr, "ERROR: Found stop without prefixing spacing.\n"); return buf;
return buf;
}
} }
#endif #endif /* REQUIRE_SPACE */
if (stop) { buf = strndup(start, (stop - m.str) - (start - m.str)); } if (stop)
{ buf = strndup(start, (stop - m.str) - (start - m.str)); }
} }
return buf; return buf;
} }
@ -208,7 +207,8 @@ expand_size(char * buf, int argc, char ** argv) {
size_t i, len, max; size_t i, len, max;
len = max = strlen(buf) + 1; len = max = strlen(buf) + 1;
for (i = 0; i < len; ++i) { for (i = 0; i < len; ++i) {
if (buf[i] == '\\') { i += 2; continue; } if (buf[i] == '\\')
{ i += 2; continue; }
else if (buf[i] == '$') { else if (buf[i] == '$') {
switch (buf[++i]) { switch (buf[++i]) {
case '@': case '@':
@ -233,7 +233,8 @@ expand(char * buf) {
size_t i; size_t i;
char * ptr = NULL; char * ptr = NULL;
for (i = 0; buf[i]; ++i) { for (i = 0; buf[i]; ++i) {
if (buf[i] == '\\') { i += 2; continue; } if (buf[i] == '\\')
{ i += 2; continue; }
else if (buf[i] == '$') { else if (buf[i] == '$') {
switch (buf[++i]) { switch (buf[++i]) {
case '@': case '@':
@ -306,8 +307,11 @@ main(int argc, char ** argv) {
} }
root(&g_filename); root(&g_filename);
buf = realloc(buf, expand_size(buf, argc, argv)); { char * buf2 = buf;
if (!buf) { free(g_short); free(g_all); return 1; } buf = realloc(buf, expand_size(buf, argc, argv));
if (!buf)
{ free(buf2); free(g_short); free(g_all); return 1; }
}
buf = expand(buf); buf = expand(buf);
fprintf(stderr, "Exec: %s\n", buf + strip(buf)); fprintf(stderr, "Exec: %s\n", buf + strip(buf));
if ((ret = ret ? 0 : run(buf))) if ((ret = ret ? 0 : run(buf)))