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

fixed the standard console handler to return an error if ARGV is not a map

Browse Source
This commit is contained in:
hyung-hwan 2020-03-05 05:32:25 +00:00
parent e10a9e0cbb
commit 577c084a10
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qse/lib/awk/StdAwk.cpp
View File

@ -872,7 +872,14 @@ int StdAwk::open_console_in (Console& io)
*/ */
argv = qse_awk_rtx_getgbl (rtx, this->gbl_argv); argv = qse_awk_rtx_getgbl (rtx, this->gbl_argv);
QSE_ASSERT (argv != QSE_NULL); QSE_ASSERT (argv != QSE_NULL);
QSE_ASSERT (QSE_AWK_RTX_GETVALTYPE (rtx, argv) == QSE_AWK_VAL_MAP); if (QSE_AWK_RTX_GETVALTYPE(rtx, argv) != QSE_AWK_VAL_MAP)
{
/* with FLEXMAP on, you can change ARGV to a scalar.
* BEGIN { ARGV="xxx"; }
* you must not do this. */
qse_awk_rtx_seterrfmt (rtx, QSE_AWK_EINVAL, QSE_NULL, QSE_T("phony value in ARGV"));
return -1;
}
map = ((qse_awk_val_map_t*)argv)->map; map = ((qse_awk_val_map_t*)argv)->map;
QSE_ASSERT (map != QSE_NULL); QSE_ASSERT (map != QSE_NULL);

9
qse/lib/awk/std.c
View File

@ -1658,7 +1658,14 @@ static int open_rio_console (qse_awk_rtx_t* rtx, qse_awk_rio_arg_t* riod)
*/ */
argv = qse_awk_rtx_getgbl(rtx, xtn->gbl_argv); argv = qse_awk_rtx_getgbl(rtx, xtn->gbl_argv);
QSE_ASSERT (argv != QSE_NULL); QSE_ASSERT (argv != QSE_NULL);
QSE_ASSERT (QSE_AWK_RTX_GETVALTYPE (rtx, argv) == QSE_AWK_VAL_MAP); if (QSE_AWK_RTX_GETVALTYPE(rtx, argv) != QSE_AWK_VAL_MAP)
{
/* with FLEXMAP on, you can change ARGV to a scalar.
* BEGIN { ARGV="xxx"; }
* you must not do this. */
qse_awk_rtx_seterrfmt (rtx, QSE_AWK_EINVAL, QSE_NULL, QSE_T("phony value in ARGV"));
return -1;
}
map = ((qse_awk_val_map_t*)argv)->map; map = ((qse_awk_val_map_t*)argv)->map;
QSE_ASSERT (map != QSE_NULL); QSE_ASSERT (map != QSE_NULL);