Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-10-09 11:53:39 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix uninitialized use of project file buffer

Browse Source 
And fix some minor typos
This commit is contained in:
pancake 2013-06-18 12:15:11 +02:00
parent 2cbce80f2f
commit edc6d4086b
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
binr/radare2/radare2.c
View File

@ -61,7 +61,7 @@ static int verify_version(int show) {
ret = 1;
if (show) printf ("%s %s\n", name, v->name);
}
if (ret) eprintf ("Warning: r2 library versions missmatch!\n");
if (ret) eprintf ("Warning: r2 library versions mismatch!\n");
return ret;
}
@ -184,6 +184,7 @@ int main(int argc, char **argv) {
RList *cmds = r_list_new ();
RList *evals = r_list_new ();
int cmdfilei = 0;
file[0] = 0;
if (r_sys_getenv ("R_DEBUG"))
r_sys_crash_handler ("gdb --pid %d");
@ -393,15 +394,17 @@ int main(int argc, char **argv) {
if (prj && *prj) {
pfile = r_core_project_info (&r, prj);
if (pfile) fh = r_core_file_open (&r, pfile, perms, mapaddr);
else eprintf ("No file\n");
else eprintf ("Cannot find project file\n");
}
}
}
if (!pfile) pfile = file;
if (fh == NULL) {
if (perms & R_IO_WRITE)
eprintf ("Cannot open '%s' for writing.\n", pfile);
else eprintf ("Cannot open '%s'.\n", pfile);
if (*pfile) {
if (perms & R_IO_WRITE)
eprintf ("Cannot open '%s' for writing.\n", pfile);
else eprintf ("Cannot open '%s'\n", pfile);
}
return 1;
}
if (r.file == NULL) // no given file

2
libr/core/project.c
View File

@ -43,7 +43,7 @@ R_API char *r_core_project_info(RCore *core, const char *prjfile) {
break;
}
}
fclose (fd);
if (fd) fclose (fd);
r_cons_printf ("Project : %s\n", prj);
if (file) r_cons_printf ("FilePath: %s\n", file);
free (prj);