hyung-hwan/hawk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a double-free issue in eval_getbline()
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
hyung-hwan
2025-12-26 19:54:13 +09:00
parent f9e5fe0027
commit 46f01ff267
3 changed files with 497 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

895
README.md
View File

File diff suppressed because it is too large Load Diff

125
lib/run.c
View File

@@ -673,7 +673,7 @@ int hawk_rtx_setgbltostrbyname (hawk_rtx_t* rtx, const hawk_ooch_t* name, const
hawk_nde_var_t var; hawk_nde_var_t var;
/* make a fake variable node for assignment and use it */ /* make a fake variable node for assignment and use it */
HAWK_MEMSET (&var, 0, HAWK_SIZEOF(var)); HAWK_MEMSET(&var, 0, HAWK_SIZEOF(var));
var.type = HAWK_NDE_NAMED; var.type = HAWK_NDE_NAMED;
var.id.name.ptr = (hawk_ooch_t*)name; var.id.name.ptr = (hawk_ooch_t*)name;
var.id.name.len = hawk_count_oocstr(name); var.id.name.len = hawk_count_oocstr(name);
@@ -1119,7 +1119,7 @@ static int init_rtx (hawk_rtx_t* rtx, hawk_t* hawk, hawk_rio_cbs_t* rio)
{ {
rtx->pattern_range_state = (hawk_oob_t*)hawk_rtx_allocmem(rtx, rtx->hawk->tree.chain_size * HAWK_SIZEOF(hawk_oob_t)); rtx->pattern_range_state = (hawk_oob_t*)hawk_rtx_allocmem(rtx, rtx->hawk->tree.chain_size * HAWK_SIZEOF(hawk_oob_t));
if (HAWK_UNLIKELY(!rtx->pattern_range_state)) goto oops_14; if (HAWK_UNLIKELY(!rtx->pattern_range_state)) goto oops_14;
HAWK_MEMSET (rtx->pattern_range_state, 0, rtx->hawk->tree.chain_size * HAWK_SIZEOF(hawk_oob_t)); HAWK_MEMSET(rtx->pattern_range_state, 0, rtx->hawk->tree.chain_size * HAWK_SIZEOF(hawk_oob_t));
} }
else rtx->pattern_range_state = HAWK_NULL; else rtx->pattern_range_state = HAWK_NULL;
@@ -1785,7 +1785,7 @@ hawk_val_t* hawk_rtx_callfun (hawk_rtx_t* rtx, hawk_fun_t* fun, hawk_val_t* args
#endif #endif
/* forge a fake node containing a function call */ /* forge a fake node containing a function call */
HAWK_MEMSET (&call, 0, HAWK_SIZEOF(call)); HAWK_MEMSET(&call, 0, HAWK_SIZEOF(call));
call.type = HAWK_NDE_FNCALL_FUN; call.type = HAWK_NDE_FNCALL_FUN;
call.u.fun.name = fun->name; call.u.fun.name = fun->name;
call.nargs = nargs; call.nargs = nargs;
@@ -7898,7 +7898,7 @@ static hawk_val_t* __eval_getline (hawk_rtx_t* rtx, hawk_nde_t* nde)
{ {
hawk_nde_getline_t* p; hawk_nde_getline_t* p;
hawk_val_t* v = HAWK_NULL, * tmp; hawk_val_t* v = HAWK_NULL, * tmp;
hawk_oocs_t dst; hawk_oocs_t dst = { HAWK_NULL, 0 };
hawk_ooecs_t* buf; hawk_ooecs_t* buf;
int n, x; int n, x;
@@ -7915,8 +7915,6 @@ static hawk_val_t* __eval_getline (hawk_rtx_t* rtx, hawk_nde_t* nde)
v = io_nde_to_str(rtx, p->in, &dst, 0); v = io_nde_to_str(rtx, p->in, &dst, 0);
if (!v || dst.len <= 0) if (!v || dst.len <= 0)
{ {
hawk_rtx_freevaloocstr(rtx, v, dst.ptr);
hawk_rtx_refdownval(rtx, v);
n = -1; n = -1;
goto skip_read; goto skip_read;
} }
@@ -7929,16 +7927,10 @@ static hawk_val_t* __eval_getline (hawk_rtx_t* rtx, hawk_nde_t* nde)
buf = &rtx->inrec.lineg; buf = &rtx->inrec.lineg;
read_console_again: read_console_again:
hawk_ooecs_clear (&rtx->inrec.lineg); hawk_ooecs_clear(&rtx->inrec.lineg);
n = hawk_rtx_readio(rtx, p->in_type, dst.ptr, buf); n = hawk_rtx_readio(rtx, p->in_type, dst.ptr, buf);
if (v)
{
hawk_rtx_freevaloocstr(rtx, v, dst.ptr);
hawk_rtx_refdownval(rtx, v);
}
if (n <= 0) if (n <= 0)
{ {
/* make getline return -1 */ /* make getline return -1 */
@@ -7948,7 +7940,7 @@ read_console_again:
* getline x[++j] * getline x[++j]
* withtout do_assignment(), ++j is skipped when getline returns 0. */ * withtout do_assignment(), ++j is skipped when getline returns 0. */
tmp = do_assignment(rtx, p->var, hawk_val_zls); tmp = do_assignment(rtx, p->var, hawk_val_zls);
if (HAWK_UNLIKELY(!tmp)) return HAWK_NULL; if (HAWK_UNLIKELY(!tmp)) goto oops;
} }
} }
else /*if (n > 0)*/ else /*if (n > 0)*/
@@ -7961,7 +7953,7 @@ read_console_again:
/* record filter based on record number(NR) */ /* record filter based on record number(NR) */
if (((rtx->gbl.nr / rtx->nrflt.limit) % rtx->nrflt.size) != rtx->nrflt.rank) if (((rtx->gbl.nr / rtx->nrflt.limit) % rtx->nrflt.size) != rtx->nrflt.rank)
{ {
if (update_fnr(rtx, rtx->gbl.fnr + 1, rtx->gbl.nr + 1) <= -1) return HAWK_NULL; if (update_fnr(rtx, rtx->gbl.fnr + 1, rtx->gbl.nr + 1) <= -1) goto oops;
/* this jump is a bit dirty. the 'if' block below hawk_rtx_readio() /* this jump is a bit dirty. the 'if' block below hawk_rtx_readio()
* will never be true. but this makes code confusing */ * will never be true. but this makes code confusing */
goto read_console_again; goto read_console_again;
@@ -7973,46 +7965,60 @@ read_console_again:
{ {
/* set $0 with the input value */ /* set $0 with the input value */
x = hawk_rtx_setrec(rtx, 0, HAWK_OOECS_OOCS(buf), 1); x = hawk_rtx_setrec(rtx, 0, HAWK_OOECS_OOCS(buf), 1);
if (x <= -1) return HAWK_NULL; if (x <= -1) goto oops;
} }
else else
{ {
hawk_val_t* v; hawk_val_t* vv;
/* treat external input numerically if it can compose a number. */ /* treat external input numerically if it can compose a number. */
/*v = hawk_rtx_makestrvalwithoocs(rtx, HAWK_OOECS_OOCS(buf));*/ /*vv = hawk_rtx_makestrvalwithoocs(rtx, HAWK_OOECS_OOCS(buf));*/
v = hawk_rtx_makenumorstrvalwithoochars(rtx, HAWK_OOECS_PTR(buf), HAWK_OOECS_LEN(buf)); vv = hawk_rtx_makenumorstrvalwithoochars(rtx, HAWK_OOECS_PTR(buf), HAWK_OOECS_LEN(buf));
if (HAWK_UNLIKELY(!v)) if (HAWK_UNLIKELY(!vv))
{ {
ADJERR_LOC(rtx, &nde->loc); ADJERR_LOC(rtx, &nde->loc);
return HAWK_NULL; goto oops;
} }
hawk_rtx_refupval(rtx, v); hawk_rtx_refupval(rtx, vv);
tmp = do_assignment(rtx, p->var, v); tmp = do_assignment(rtx, p->var, vv);
hawk_rtx_refdownval(rtx, v); hawk_rtx_refdownval(rtx, vv);
if (HAWK_UNLIKELY(!tmp)) return HAWK_NULL; if (HAWK_UNLIKELY(!tmp)) goto oops;
} }
/* update FNR & NR if reading from console */ /* update FNR & NR if reading from console */
if (p->in_type == HAWK_IN_CONSOLE && if (p->in_type == HAWK_IN_CONSOLE &&
update_fnr(rtx, rtx->gbl.fnr + 1, rtx->gbl.nr + 1) <= -1) update_fnr(rtx, rtx->gbl.fnr + 1, rtx->gbl.nr + 1) <= -1)
{ {
return HAWK_NULL; goto oops;
} }
} }
skip_read: skip_read:
if (v)
{
if (dst.ptr) hawk_rtx_freevaloocstr(rtx, v, dst.ptr);
hawk_rtx_refdownval(rtx, v);
}
tmp = hawk_rtx_makeintval(rtx, n); tmp = hawk_rtx_makeintval(rtx, n);
if (HAWK_UNLIKELY(!tmp)) ADJERR_LOC(rtx, &nde->loc); if (HAWK_UNLIKELY(!tmp)) ADJERR_LOC(rtx, &nde->loc);
return tmp; return tmp;
oops:
if (v)
{
if (dst.ptr) hawk_rtx_freevaloocstr(rtx, v, dst.ptr);
hawk_rtx_refdownval(rtx, v);
}
return HAWK_NULL;
} }
static hawk_val_t* __eval_getbline (hawk_rtx_t* rtx, hawk_nde_t* nde) static hawk_val_t* __eval_getbline (hawk_rtx_t* rtx, hawk_nde_t* nde)
{ {
hawk_nde_getline_t* p; hawk_nde_getline_t* p;
hawk_val_t* v = HAWK_NULL, * tmp; hawk_val_t* v = HAWK_NULL, * tmp;
hawk_oocs_t dst; hawk_oocs_t dst = {HAWK_NULL, 0};
hawk_becs_t* buf; hawk_becs_t* buf;
int n; int n;
@@ -8029,8 +8035,6 @@ static hawk_val_t* __eval_getbline (hawk_rtx_t* rtx, hawk_nde_t* nde)
v = io_nde_to_str(rtx, p->in, &dst, 0); v = io_nde_to_str(rtx, p->in, &dst, 0);
if (!v || dst.len <= 0) if (!v || dst.len <= 0)
{ {
hawk_rtx_freevaloocstr(rtx, v, dst.ptr);
hawk_rtx_refdownval(rtx, v);
n = -1; n = -1;
goto skip_read; goto skip_read;
} }
@@ -8043,23 +8047,17 @@ static hawk_val_t* __eval_getbline (hawk_rtx_t* rtx, hawk_nde_t* nde)
buf = &rtx->inrec.linegb; buf = &rtx->inrec.linegb;
read_console_again: read_console_again:
hawk_becs_clear (&rtx->inrec.linegb); hawk_becs_clear(&rtx->inrec.linegb);
n = hawk_rtx_readiobytes(rtx, p->in_type, dst.ptr, buf); n = hawk_rtx_readiobytes(rtx, p->in_type, dst.ptr, buf);
if (v)
{
hawk_rtx_freevaloocstr(rtx, v, dst.ptr);
hawk_rtx_refdownval(rtx, v);
}
if (n <= 0) if (n <= 0)
{ {
/* make getline return -1 or 0*/ /* make getline return -1 or 0*/
if (p->var) if (p->var)
{ {
tmp = do_assignment(rtx, p->var, v); tmp = do_assignment(rtx, p->var, hawk_val_zls);
if (tmp == HAWK_NULL) return HAWK_NULL; if (HAWK_UNLIKELY(!tmp)) goto oops;
} }
} }
else /*if (n > 0)*/ else /*if (n > 0)*/
@@ -8072,7 +8070,7 @@ read_console_again:
/* record filter based on record number(NR) */ /* record filter based on record number(NR) */
if (((rtx->gbl.nr / rtx->nrflt.limit) % rtx->nrflt.size) != rtx->nrflt.rank) if (((rtx->gbl.nr / rtx->nrflt.limit) % rtx->nrflt.size) != rtx->nrflt.rank)
{ {
if (update_fnr(rtx, rtx->gbl.fnr + 1, rtx->gbl.nr + 1) <= -1) return HAWK_NULL; if (update_fnr(rtx, rtx->gbl.fnr + 1, rtx->gbl.nr + 1) <= -1) goto oops;
/* this jump is a bit dirty. the 'if' block below hawk_rtx_readio() /* this jump is a bit dirty. the 'if' block below hawk_rtx_readio()
* will never be true. but this makes code confusing */ * will never be true. but this makes code confusing */
goto read_console_again; goto read_console_again;
@@ -8084,42 +8082,55 @@ read_console_again:
{ {
/* set $0 with the input value */ /* set $0 with the input value */
/*x = hawk_rtx_setbrec(rtx, 0, HAWK_BECS_BCS(buf)); /*x = hawk_rtx_setbrec(rtx, 0, HAWK_BECS_BCS(buf));
if (x <= -1) return HAWK_NULL;*/ if (x <= -1) goto oops;*/
/* TODO: can i support this? */ /* TODO: can i support this? */
hawk_rtx_seterrfmt(rtx, &nde->loc, HAWK_ENOIMPL, HAWK_T("getbline without a variable not supported")); hawk_rtx_seterrfmt(rtx, &nde->loc, HAWK_ENOIMPL, HAWK_T("getbline without a variable not supported"));
return HAWK_NULL; goto oops;
} }
else else
{ {
hawk_val_t* v; hawk_val_t* vv;
/* treat external input numerically if it can compose a number. */ /* treat external input numerically if it can compose a number. */
/*v = hawk_rtx_makembsvalwithbcs(rtx, HAWK_BECS_BCS(buf));*/ /*vv = hawk_rtx_makembsvalwithbcs(rtx, HAWK_BECS_BCS(buf));*/
v = hawk_rtx_makenumormbsvalwithbchars(rtx, HAWK_BECS_PTR(buf), HAWK_BECS_LEN(buf)); vv = hawk_rtx_makenumormbsvalwithbchars(rtx, HAWK_BECS_PTR(buf), HAWK_BECS_LEN(buf));
if (v == HAWK_NULL) if (vv == HAWK_NULL)
{ {
ADJERR_LOC(rtx, &nde->loc); ADJERR_LOC(rtx, &nde->loc);
return HAWK_NULL; goto oops;
} }
hawk_rtx_refupval(rtx, v); hawk_rtx_refupval(rtx, vv);
tmp = do_assignment(rtx, p->var, v); tmp = do_assignment(rtx, p->var, vv);
hawk_rtx_refdownval(rtx, v); hawk_rtx_refdownval(rtx, vv);
if (tmp == HAWK_NULL) return HAWK_NULL; if (tmp == HAWK_NULL) goto oops;
} }
/* update FNR & NR if reading from console */ /* update FNR & NR if reading from console */
if (p->in_type == HAWK_IN_CONSOLE && if (p->in_type == HAWK_IN_CONSOLE &&
update_fnr(rtx, rtx->gbl.fnr + 1, rtx->gbl.nr + 1) <= -1) update_fnr(rtx, rtx->gbl.fnr + 1, rtx->gbl.nr + 1) <= -1)
{ {
return HAWK_NULL; goto oops;
} }
} }
skip_read: skip_read:
if (v)
{
if (dst.ptr) hawk_rtx_freevaloocstr(rtx, v, dst.ptr);
hawk_rtx_refdownval(rtx, v);
}
tmp = hawk_rtx_makeintval(rtx, n); tmp = hawk_rtx_makeintval(rtx, n);
if (!tmp) ADJERR_LOC(rtx, &nde->loc); if (!tmp) ADJERR_LOC(rtx, &nde->loc);
return tmp; return tmp;
oops:
if (v)
{
if (dst.ptr) hawk_rtx_freevaloocstr(rtx, v, dst.ptr);
hawk_rtx_refdownval(rtx, v);
}
return HAWK_NULL;
} }
static hawk_val_t* eval_getline (hawk_rtx_t* rtx, hawk_nde_t* nde) static hawk_val_t* eval_getline (hawk_rtx_t* rtx, hawk_nde_t* nde)
@@ -8430,8 +8441,8 @@ hawk_ooch_t* hawk_rtx_format (
if (out == HAWK_NULL) out = &rtx->format.out; if (out == HAWK_NULL) out = &rtx->format.out;
if (fbu == HAWK_NULL) fbu = &rtx->format.fmt; if (fbu == HAWK_NULL) fbu = &rtx->format.fmt;
hawk_ooecs_clear (out); hawk_ooecs_clear(out);
hawk_ooecs_clear (fbu); hawk_ooecs_clear(fbu);
for (i = 0; i < fmt_len; i++) for (i = 0; i < fmt_len; i++)
{ {
@@ -9246,7 +9257,7 @@ wp_mod_main:
if (!args || val) stack_arg_idx++; if (!args || val) stack_arg_idx++;
else args = args->next; else args = args->next;
skip_taking_arg: skip_taking_arg:
hawk_ooecs_clear (fbu); hawk_ooecs_clear(fbu);
} }
/* flush uncompleted formatting sequence */ /* flush uncompleted formatting sequence */
@@ -9322,8 +9333,8 @@ hawk_bch_t* hawk_rtx_formatmbs (
if (out == HAWK_NULL) out = &rtx->formatmbs.out; if (out == HAWK_NULL) out = &rtx->formatmbs.out;
if (fbu == HAWK_NULL) fbu = &rtx->formatmbs.fmt; if (fbu == HAWK_NULL) fbu = &rtx->formatmbs.fmt;
hawk_becs_clear (out); hawk_becs_clear(out);
hawk_becs_clear (fbu); hawk_becs_clear(fbu);
for (i = 0; i < fmt_len; i++) for (i = 0; i < fmt_len; i++)
{ {
@@ -10144,7 +10155,7 @@ wp_mod_main:
if (!args || val) stack_arg_idx++; if (!args || val) stack_arg_idx++;
else args = args->next; else args = args->next;
skip_taking_arg: skip_taking_arg:
hawk_becs_clear (fbu); hawk_becs_clear(fbu);
} }
/* flush uncompleted formatting sequence */ /* flush uncompleted formatting sequence */

14
lib/utl-sort.c
View File

@@ -136,7 +136,7 @@ static HAWK_INLINE hawk_oob_t* med3x (hawk_oob_t* a, hawk_oob_t* b, hawk_oob_t*
} }
} }
void hawk_qsort (void* base, hawk_oow_t nmemb, hawk_oow_t size, hawk_sort_comper_t comper, void* ctx) void hawk_qsort(void* base, hawk_oow_t nmemb, hawk_oow_t size, hawk_sort_comper_t comper, void* ctx)
{ {
hawk_oob_t* pa, * pb, * pc, * pd, * pl, * pm, * pn; hawk_oob_t* pa, * pb, * pc, * pd, * pl, * pm, * pn;
int swaptype, swap_cnt; int swaptype, swap_cnt;
@@ -388,7 +388,7 @@ loop:
#define REF(x,i) (&((x)[(i)*size])) #define REF(x,i) (&((x)[(i)*size]))
void hawk_qsort (void* base, hawk_oow_t nmemb, hawk_oow_t size, void* arg, void hawk_qsort(void* base, hawk_oow_t nmemb, hawk_oow_t size, void* arg,
int (*compar)(const void*, const void*, void*)) int (*compar)(const void*, const void*, void*))
{ {
hawk_oow_t pivot, start, end; hawk_oow_t pivot, start, end;
@@ -423,8 +423,8 @@ void hawk_qsort (void* base, hawk_oow_t nmemb, hawk_oow_t size, void* arg,
swap (REF(p,nmemb-1), REF(p,start), size); swap (REF(p,nmemb-1), REF(p,start), size);
pivot = start; /* adjust the pivot index */ pivot = start; /* adjust the pivot index */
hawk_qsort (REF(p,0), pivot, size, arg, compar); hawk_qsort(REF(p,0), pivot, size, arg, compar);
hawk_qsort (REF(p,pivot+1), nmemb - pivot - 1, size, arg, compar); hawk_qsort(REF(p,pivot+1), nmemb - pivot - 1, size, arg, compar);
} }
/* /*
@@ -433,7 +433,7 @@ void hawk_qsort (void* base, hawk_oow_t nmemb, hawk_oow_t size, void* arg,
#define swap(a, b) do { a ^= b; b ^= a; a ^= b; } while (0) #define swap(a, b) do { a ^= b; b ^= a; a ^= b; } while (0)
void qsort (int* x, size_t n) void qsort(int* x, size_t n)
{ {
size_t index, start, end; size_t index, start, end;
int pivot; int pivot;
@@ -471,8 +471,8 @@ void qsort (int* x, size_t n)
x[start] = pivot; x[start] = pivot;
index = start; /* adjust the pivot index */ index = start; /* adjust the pivot index */
qsort (x, index); qsort(x, index);
qsort (&x[index + 1], n - index - 1); qsort(&x[index + 1], n - index - 1);
} }
#endif #endif