fries/quickjs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Accept shell scripts in JS_DetectModule (#358)

Browse source 
- use `skip_shebang` in `JS_DetectModule` before scanning for
  `import` statements
This commit is contained in:
Charlie Gordon 2024-04-07 16:23:50 +02:00 committed by GitHub
parent 15c6a773b6
commit d61988211c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
quickjs.c
View file

@ -19924,6 +19924,31 @@ static int peek_token(JSParseState *s, BOOL no_line_terminator)
return simple_next_token(&p, no_line_terminator); return simple_next_token(&p, no_line_terminator);
} }
static void skip_shebang(const uint8_t **pp, const uint8_t *buf_end)
{
const uint8_t *p = *pp;
int c;
if (p[0] == '#' && p[1] == '!') {
p += 2;
while (p < buf_end) {
if (*p == '\n' || *p == '\r') {
break;
} else if (*p >= 0x80) {
c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p);
if (c == CP_LS || c == CP_PS) {
break;
} else if (c == -1) {
p++; /* skip invalid UTF-8 */
}
} else {
p++;
}
}
*pp = p;
}
}
/* return true if 'input' contains the source of a module /* return true if 'input' contains the source of a module
(heuristic). 'input' must be a zero terminated. (heuristic). 'input' must be a zero terminated.
@ -19934,6 +19959,8 @@ BOOL JS_DetectModule(const char *input, size_t input_len)
{ {
const uint8_t *p = (const uint8_t *)input; const uint8_t *p = (const uint8_t *)input;
int tok; int tok;
skip_shebang(&p, p + input_len);
switch(simple_next_token(&p, FALSE)) { switch(simple_next_token(&p, FALSE)) {
case TOK_IMPORT: case TOK_IMPORT:
tok = simple_next_token(&p, FALSE); tok = simple_next_token(&p, FALSE);
@ -32247,31 +32274,6 @@ JSValue JS_EvalFunction(JSContext *ctx, JSValue fun_obj)
return JS_EvalFunctionInternal(ctx, fun_obj, ctx->global_obj, NULL, NULL); return JS_EvalFunctionInternal(ctx, fun_obj, ctx->global_obj, NULL, NULL);
} }
static void skip_shebang(JSParseState *s)
{
const uint8_t *p = s->buf_ptr;
int c;
if (p[0] == '#' && p[1] == '!') {
p += 2;
while (p < s->buf_end) {
if (*p == '\n' || *p == '\r') {
break;
} else if (*p >= 0x80) {
c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p);
if (c == CP_LS || c == CP_PS) {
break;
} else if (c == -1) {
p++; /* skip invalid UTF-8 */
}
} else {
p++;
}
}
s->buf_ptr = p;
}
}
/* 'input' must be zero terminated i.e. input[input_len] = '\0'. */ /* 'input' must be zero terminated i.e. input[input_len] = '\0'. */
static JSValue __JS_EvalInternal(JSContext *ctx, JSValue this_obj, static JSValue __JS_EvalInternal(JSContext *ctx, JSValue this_obj,
const char *input, size_t input_len, const char *input, size_t input_len,
@ -32287,7 +32289,7 @@ static JSValue __JS_EvalInternal(JSContext *ctx, JSValue this_obj,
JSModuleDef *m; JSModuleDef *m;
js_parse_init(ctx, s, input, input_len, filename); js_parse_init(ctx, s, input, input_len, filename);
skip_shebang(s); skip_shebang(&s->buf_ptr, s->buf_end);
eval_type = flags & JS_EVAL_TYPE_MASK; eval_type = flags & JS_EVAL_TYPE_MASK;
m = NULL; m = NULL;