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

fixed an error handling issue in get_symbol_array_literal()

Browse Source
This commit is contained in:
hyung-hwan
2018-04-07 06:28:54 +00:00
parent c76eb99472
commit 1df93d0be6
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
hcl/lib/read.c
View File

@ -371,6 +371,9 @@ static int copy_string_to (hcl_t* hcl, const hcl_oocs_t* src, hcl_oocs_t* dst, h
#define GET_TOKEN_WITH_ERRRET(hcl, v_ret) \ #define GET_TOKEN_WITH_ERRRET(hcl, v_ret) \
do { if (get_token(hcl) <= -1) return v_ret; } while (0) do { if (get_token(hcl) <= -1) return v_ret; } while (0)
#define GET_TOKEN_WITH_GOTO(hcl, goto_label) \
do { if (get_token(hcl) <= -1) goto goto_label; } while (0)
#define ADD_TOKEN_STR(hcl,s,l) \ #define ADD_TOKEN_STR(hcl,s,l) \
do { if (add_token_str(hcl, s, l) <= -1) return -1; } while (0) do { if (add_token_str(hcl, s, l) <= -1) return -1; } while (0)
@ -1325,14 +1328,14 @@ static int begin_include (hcl_t* hcl)
/*arg->nl = '\0';*/ /*arg->nl = '\0';*/
arg->includer = hcl->c->curinp; arg->includer = hcl->c->curinp;
if (hcl->c->reader (hcl, HCL_IO_OPEN, arg) <= -1) if (hcl->c->reader(hcl, HCL_IO_OPEN, arg) <= -1)
{ {
hcl_setsynerrbfmt (hcl, HCL_SYNERR_INCLUDE, TOKEN_LOC(hcl), TOKEN_NAME(hcl), "unable to include %js", io_name); hcl_setsynerrbfmt (hcl, HCL_SYNERR_INCLUDE, TOKEN_LOC(hcl), TOKEN_NAME(hcl), "unable to include %js", io_name);
goto oops; goto oops;
} }
#if 0 #if 0
GET_TOKEN (hcl); GET_TOKEN_WITH_GOTO (hcl, oops);
if (TOKEN_TYPE(hcl) != HCL_IOTOK_DOT) if (TOKEN_TYPE(hcl) != HCL_IOTOK_DOT)
{ {
/* check if a period is following the includee name */ /* check if a period is following the includee name */
@ -1753,36 +1756,32 @@ static int get_symbol_array_literal (hcl_t* hcl, hcl_oop_t* xlit)
HCL_ASSERT (hcl, hcl->c->r.salit.size == 0); HCL_ASSERT (hcl, hcl->c->r.salit.size == 0);
HCL_ASSERT (hcl, TOKEN_TYPE(hcl) == HCL_IOTOK_VBAR); HCL_ASSERT (hcl, TOKEN_TYPE(hcl) == HCL_IOTOK_VBAR);
GET_TOKEN(hcl); GET_TOKEN_WITH_GOTO(hcl, oops);
while (TOKEN_TYPE(hcl) == HCL_IOTOK_IDENT /* || TOKEN_TYPE(hcl) == HCL_IOTOK_IDENT_DOTTED */) while (TOKEN_TYPE(hcl) == HCL_IOTOK_IDENT /* || TOKEN_TYPE(hcl) == HCL_IOTOK_IDENT_DOTTED */)
{ {
sym = hcl_makesymbol(hcl, TOKEN_NAME_PTR(hcl), TOKEN_NAME_LEN(hcl)); sym = hcl_makesymbol(hcl, TOKEN_NAME_PTR(hcl), TOKEN_NAME_LEN(hcl));
if (!sym) return -1; if (!sym) goto oops;
if (HCL_OBJ_GET_FLAGS_SYNCODE(sym) || HCL_OBJ_GET_FLAGS_KERNEL(sym)) if (HCL_OBJ_GET_FLAGS_SYNCODE(sym) || HCL_OBJ_GET_FLAGS_KERNEL(sym))
{ {
hcl_setsynerrbfmt (hcl, HCL_SYNERR_BANNEDVARNAME, HCL_NULL, HCL_NULL, hcl_setsynerrbfmt (hcl, HCL_SYNERR_BANNEDVARNAME, HCL_NULL, HCL_NULL,
"special symbol not to be declared as a variable - %O", sym); /* TOOD: error location */ "special symbol not to be declared as a variable - %O", sym); /* TOOD: error location */
return -1; goto oops;
} }
if (add_to_symbol_array_literal_buffer(hcl, sym) <= -1) return -1; if (add_to_symbol_array_literal_buffer(hcl, sym) <= -1) goto oops;
GET_TOKEN (hcl); GET_TOKEN_WITH_GOTO (hcl, oops);
} }
if (TOKEN_TYPE(hcl) != HCL_IOTOK_VBAR) if (TOKEN_TYPE(hcl) != HCL_IOTOK_VBAR)
{ {
hcl_setsynerr (hcl, HCL_SYNERR_VBAR, TOKEN_LOC(hcl), TOKEN_NAME(hcl)); hcl_setsynerr (hcl, HCL_SYNERR_VBAR, TOKEN_LOC(hcl), TOKEN_NAME(hcl));
return -1; goto oops;
} }
sa = hcl_makearray(hcl, hcl->c->r.salit.size, 0); sa = hcl_makearray(hcl, hcl->c->r.salit.size, 0);
if (!sa) if (!sa) goto oops;
{
hcl->c->r.salit.size = 0; /* reset literal count... */
return -1;
}
for (i = 0; i < hcl->c->r.salit.size; i++) for (i = 0; i < hcl->c->r.salit.size; i++)
((hcl_oop_oop_t)sa)->slot[i] = hcl->c->r.salit.ptr[i]; ((hcl_oop_oop_t)sa)->slot[i] = hcl->c->r.salit.ptr[i];
@ -1794,6 +1793,10 @@ static int get_symbol_array_literal (hcl_t* hcl, hcl_oop_t* xlit)
hcl->c->r.salit.size = 0; /* reset literal count... */ hcl->c->r.salit.size = 0; /* reset literal count... */
return 0; return 0;
oops:
hcl->c->r.salit.size = 0; /* reset literal count... */
return -1;
} }
static int read_object (hcl_t* hcl) static int read_object (hcl_t* hcl)