dnrops
/
radare2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix memory leak reported by coverity in mach0 (#16405)

This commit is contained in:
radare 2020-04-02 16:40:09 +02:00 committed by GitHub
parent a87fdf66ee
commit ec49299cb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libr/bin/format/objc/mach0_classes.c
View File

@ -182,7 +182,6 @@ static void get_ivar_list_t(mach0_ut p, RBinFile *bf, RBinClass *klass) {
struct MACH0_(SIVar) i;
mach0_ut r;
ut32 offset, left, j;
char *name = NULL;
int len;
bool bigendian;
@ -295,6 +294,7 @@ static void get_ivar_list_t(mach0_ut p, RBinFile *bf, RBinClass *klass) {
if (r > bf->size || r + left > bf->size) {
goto error;
}
char *name;
if (bin->has_crypto) {
name = strdup ("some_encrypted_data");
left = strlen (name) + 1;
@ -311,9 +311,7 @@ static void get_ivar_list_t(mach0_ut p, RBinFile *bf, RBinClass *klass) {
}
// XXX the field name shouldnt contain the class name
field->name = r_str_newf ("%s::%s%s", klass->name, "(ivar)", name);
//field->name = name; // (ivar)
//name = NULL;
// R_FREE (name);
R_FREE (name);
}
r = va2pa (i.type, NULL, &left, bf);

15
libr/core/panels.c
View File

@ -371,7 +371,7 @@ static void __panels_layout_refresh(RCore *core);
static void __panels_layout(RPanels *panels);
static void __layout_default(RPanels *panels);
static void __layout_equal_hor(RPanels *panels);
static void r_save_panels_layout_noname(RCore *core);
R_API void r_save_panels_layout(RCore *core, const char *_name);
R_API bool r_load_panels_layout(RCore *core, const char *_name);
static void __split_panel_vertical(RCore *core, RPanel *p, const char *name, const char *cmd);
static void __split_panel_horizontal(RCore *core, RPanel *p, const char *name, const char *cmd);
@ -3317,7 +3317,7 @@ int __close_file_cb(void *user) {
int __save_layout_cb(void *user) {
RCore *core = (RCore *)user;
r_save_panels_layout_noname (core);
r_save_panels_layout (core, NULL);
__set_mode (core, PANEL_MODE_DEFAULT);
__clear_panels_menu (core);
__get_cur_panel (core->panels)->view->refresh = true;
@ -5650,15 +5650,18 @@ char *__get_panels_config_file_from_dir (const char *file) {
return ret;
}
static void r_save_panels_layout_noname(RCore *core) {
R_API void r_save_panels_layout(RCore *core, const char *oname) {
int i;
if (!core->panels) {
return;
}
const char *name = __show_status_input (core, "Name for the layout: ");
const char *name = oname;
if (R_STR_ISEMPTY (name)) {
(void)__show_status (core, "Name can't be empty!");
return;
name = __show_status_input (core, "Name for the layout: ");
if (R_STR_ISEMPTY (name)) {
(void)__show_status (core, "Name can't be empty!");
return;
}
}
char *config_path = __create_panels_config_path (name);
RPanels *panels = core->panels;