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

Fix coverity bugs (#1654)

Browse source 
* CID 316614: Use after free (USE_AFTER_FREE)
* CID 316535: Use after free (USE_AFTER_FREE)
* CID 316652: Use after free (USE_AFTER_FREE)
* CID 316504: Unsigned compared against 0 (NO_EFFECT)
* CID 316439: Resource leak (RESOURCE_LEAK)
* CID 356127: Dereference after null check (name can never be NULL)
* CID 320881: Resource leak (RESOURCE_LEAK)
* CID 320885: Missing break in switch (MISSING_BREAK)
* CID 316679: Resource leak (RESOURCE_LEAK)
* CID 316574: Explicit null dereferenced (FORWARD_NULL)
* CID 356105: Resource leak (RESOURCE_LEAK)
* Fixed uninitialized building issue
This commit is contained in:
Giovanni 2021-09-11 09:30:57 +02:00 committed by GitHub
parent 3ecfa48565
commit 8ace435328
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
binrz/rz-test/rz-test.c
View file

@ -344,6 +344,7 @@ int rz_test_main(int argc, const char **argv) {
int i;
for (i = opt.ind; i < argc; i++) {
const char *arg = argv[i];
char *alloc_arg = NULL;
if (*arg == '@') {
arg++;
eprintf("Category: %s\n", arg);
@ -370,7 +371,7 @@ int rz_test_main(int argc, const char **argv) {
} else if (!strcmp(arg, "cmds")) {
arg = "db";
} else {
arg = rz_str_newf("db/%s", arg + 1);
arg = alloc_arg = rz_str_newf("db/%s", arg + 1);
}
}
char *tf = rz_file_abspath_rel(cwd, arg);
@ -378,9 +379,11 @@ int rz_test_main(int argc, const char **argv) {
eprintf("Failed to load tests from \"%s\"\n", tf);
rz_test_test_database_free(state.db);
free(tf);
free(alloc_arg);
ret = -1;
goto beach;
}
RZ_FREE(alloc_arg);
free(tf);
}
} else {

1
librz/asm/asm.c
View file

@ -1019,6 +1019,7 @@ RZ_API RzAsmCode *rz_asm_massemble(RzAsm *a, const char *assembly) {
if (op.buf_inc && rz_buf_size(op.buf_inc) > 1) {
char *inc = rz_buf_to_string(op.buf_inc);
rz_buf_free(op.buf_inc);
op.buf_inc = NULL;
if (inc) {
ret += rz_hex_str2bin(inc, acode->bytes + idx + ret);
free(inc);

2
librz/bin/format/java/class_bin.c
View file

@ -1040,7 +1040,7 @@ RZ_API RZ_OWN RzList *rz_bin_java_class_strings(RZ_NONNULL RzBinJavaClass *bin)
}
static char *add_class_name_to_name(char *name, char *classname) {
if (classname && name) {
if (classname) {
return rz_str_newf("%s.%s", classname, name);
}
return strdup(name);

2
librz/core/disasm.c
View file

@ -5804,7 +5804,7 @@ toro:
if (ds->immtrim) {
free(ds->opstr);
ds->opstr = strdup(rz_asm_op_get_asm(&ds->asmop));
rz_parse_immtrim(ds->opstr);
ds->opstr = rz_parse_immtrim(ds->opstr);
}
}
if (ds->asm_instr) {

3
librz/main/rz-hash.c
View file

@ -260,9 +260,11 @@ static bool rz_hash_parse_hexadecimal(const char *option, const char *hexadecima
if (hexlen < 1 || !hexadecimal) {
RZ_LOG_ERROR("rz-hash: error, option %s is empty.\n", option);
free(sstdin);
return false;
} else if (hexlen & 1) {
RZ_LOG_ERROR("rz-hash: error, option %s is not a valid hexadecimal (len is not pair: %d).\n", option, hexlen);
free(sstdin);
return false;
}
*buffer = NULL;
@ -1206,6 +1208,7 @@ RZ_API int rz_main_rz_hash(int argc, const char **argv) {
goto rz_main_rz_hash_end;
case RZ_HASH_OP_HELP:
result = 0;
/* fall-thru */
default:
rz_hash_show_help(false);
goto rz_main_rz_hash_end;

1
librz/main/rz-run.c
View file

@ -73,6 +73,7 @@ RZ_API int rz_main_rz_run(int argc, const char **argv) {
ret = rz_run_config_env(p);
if (ret) {
printf("error while configuring the environment.\n");
rz_run_free(p);
return 1;
}
ret = rz_run_start(p);

2
librz/main/rz-sign.c
View file

@ -53,7 +53,7 @@ static void find_functions(RzCore *core, size_t count) {
switch (count) {
case 0: cmd = "aa"; break;
case 1: cmd = "aaa"; break;
case 2: cmd = "aaaa"; break;
default: cmd = "aaaa"; break;
}
rz_core_cmd0(core, cmd);
}

4
librz/util/strpool.c
View file

@ -48,7 +48,7 @@ RZ_API char *rz_strpool_alloc(RzStrpool *p, int l) {
ret = realloc(p->str, p->size);
if (!ret) {
eprintf("Realloc failed!\n");
free(p->str);
RZ_FREE(p->str);
return NULL;
}
p->str = ret;
@ -92,7 +92,7 @@ RZ_API int rz_strpool_fit(RzStrpool *p) {
s = realloc(p->str, p->len);
if (!s) {
eprintf("Realloc failed!\n");
free(p->str);
RZ_FREE(p->str);
return false;
}
p->str = s;

21
librz/util/subprocess.c
View file

@ -630,6 +630,9 @@ static char **create_child_env(const char *envvars[], const char *envvals[], siz
char **ep;
size_t new_env_size = env_size, size = 0;
size_t *positions = RZ_NEWS(size_t, env_size);
if (!positions) {
return NULL;
}
for (size_t i = 0; i < env_size; i++) {
positions[i] = SIZE_MAX;
}
@ -652,6 +655,10 @@ static char **create_child_env(const char *envvars[], const char *envvals[], siz
}
char **new_env = RZ_NEWS(char *, size + new_env_size + 1);
if (!new_env) {
free(positions);
return NULL;
}
for (size_t i = 0; i < size; i++) {
new_env[i] = strdup(environ[i]);
}
@ -676,6 +683,9 @@ static char **create_child_env(const char *envvars[], const char *envvals[], siz
}
static void destroy_child_env(char **child_env) {
if (!child_env) {
return;
}
char **ep;
for (ep = child_env; *ep; ep++) {
free(*ep);
@ -684,6 +694,8 @@ static void destroy_child_env(char **child_env) {
}
RZ_API RzSubprocess *rz_subprocess_start_opt(RzSubprocessOpt *opt) {
RzSubprocess *proc = NULL;
char **child_env = NULL;
char **argv = calloc(opt->args_size + 2, sizeof(char *));
if (!argv) {
return NULL;
@ -694,7 +706,7 @@ RZ_API RzSubprocess *rz_subprocess_start_opt(RzSubprocessOpt *opt) {
}
// done by calloc: argv[args_size + 1] = NULL;
subprocess_lock();
RzSubprocess *proc = RZ_NEW0(RzSubprocess);
proc = RZ_NEW0(RzSubprocess);
if (!proc) {
goto error;
}
@ -756,7 +768,7 @@ RZ_API RzSubprocess *rz_subprocess_start_opt(RzSubprocessOpt *opt) {
// Let's create the environment for the child in the parent, with malloc,
// because we can't use functions that lock after fork
char **child_env = create_child_env(opt->envvars, opt->envvals, opt->env_size);
child_env = create_child_env(opt->envvars, opt->envvals, opt->env_size);
proc->pid = rz_sys_fork();
if (proc->pid == -1) {
@ -838,6 +850,7 @@ error:
if (stdin_pipe[1] != -1) {
rz_sys_pipe_close(stdin_pipe[1]);
}
destroy_child_env(child_env);
subprocess_unlock();
return NULL;
}
@ -934,14 +947,14 @@ static RzSubprocessWaitReason subprocess_wait(RzSubprocess *proc, ut64 timeout_m
if (stdout_enabled && FD_ISSET(proc->stdout_fd, &rfds)) {
timedout = false;
size_t r = read_to_strbuf(&proc->out, proc->stdout_fd, &stdout_eof, n_bytes);
if (r >= 0 && n_bytes) {
if (r > 0 && n_bytes) {
n_bytes -= r;
}
}
if (stderr_enabled && FD_ISSET(proc->stderr_fd, &rfds)) {
timedout = false;
size_t r = read_to_strbuf(&proc->err, proc->stderr_fd, &stderr_eof, n_bytes);
if (r >= 0 && n_bytes) {
if (r > 0 && n_bytes) {
n_bytes -= r;
}
}