file not found SEGFAULT fix
git-svn-id: svn://svn.berlios.de/openocd/trunk@1030 b42882b7-edfa-0310-969c-e2dbd0fdcd60__archive__
parent
76be215ee1
commit
4eadb146c1
|
@ -81,7 +81,7 @@ char *find_file(const char *file)
|
|||
snprintf(full_path, 1024, "%s/%s", dir, file);
|
||||
fp = fopen(full_path, mode);
|
||||
}
|
||||
|
||||
|
||||
if (fp)
|
||||
{
|
||||
fclose(fp);
|
||||
|
@ -100,6 +100,8 @@ FILE *open_file_from_path (char *file, char *mode)
|
|||
} else
|
||||
{
|
||||
char *full_path=find_file(file);
|
||||
if (full_path==NULL)
|
||||
return NULL;
|
||||
FILE *fp = NULL;
|
||||
fp = fopen(full_path, mode);
|
||||
free(full_path);
|
||||
|
|
|
@ -1969,6 +1969,8 @@ int handle_mw_command(struct command_context_s *cmd_ctx, char *cmd, char **args,
|
|||
default:
|
||||
return ERROR_OK;
|
||||
}
|
||||
keep_alive();
|
||||
|
||||
if (retval!=ERROR_OK)
|
||||
{
|
||||
return retval;
|
||||
|
|
Loading…
Reference in New Issue