portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add hint for unexpected type definition (#2393)

Browse source
This commit is contained in:
Peiwei Hu 2022-03-14 10:46:59 +08:00 committed by GitHub
parent 7ede9dfd39
commit d7cb78879e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
librz/type/parser/c_cpp_parser.c
View file

@ -10,6 +10,18 @@
#include <types_parser.h>
#define TS_START_END(node, start, end) \
do { \
start = ts_node_start_byte(node); \
end = ts_node_end_byte(node); \
} while (0)
static char *ts_node_sub_string(TSNode node, const char *cstr) {
ut32 start, end;
TS_START_END(node, start, end);
return rz_str_newf("%.*s", end - start, cstr + start);
}
// Declare the `tree_sitter_c` function, which is
// implemented by the `tree-sitter-c` library.
TSLanguage *tree_sitter_c();
@ -168,10 +180,12 @@ static int type_parse_string(CParserState *state, const char *code, char **error
for (i = 0; i < root_node_child_count; i++) {
TSNode child = ts_node_named_child(root_node, i);
// We skip ";" or "," - empty expressions
const char *node_type = ts_node_type(child);
if (!strcmp(node_type, "expression_statement")) {
char *node_code = ts_node_sub_string(child, code);
if (!strcmp(node_code, ";") || !strcmp(node_code, ",")) {
free(node_code);
continue;
}
free(node_code);
parser_debug(state, "Processing %d child...\n", i);
result += parse_type_nodes_save(state, child, code);
}

5
librz/type/parser/types_parser.c
View file

@ -1899,6 +1899,11 @@ int parse_type_nodes_save(CParserState *state, TSNode node, const char *text) {
return -1;
}
}
if (result) {
parser_error(state, "Unsupported type definition: %s\n", ts_node_sub_string(node, text));
}
// In case of anonymous type we could use identifier as a name for this type?
return result;
}

6
test/db/cmd/types
View file

@ -2068,9 +2068,13 @@ NAME=td crash
FILE==
CMDS=<<EOF
td "struct;"
td "stract;"
td "struct crash __attribute__((packed)) { };"
EOF
EXPECT=<<EOF
EXPECT_ERR=<<EOF
Unsupported type definition: struct
Unsupported type definition: stract;
Unsupported type definition: struct crash __attribute__((packed)) { }
EOF
RUN