summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-10-08 11:06:44 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-10-08 11:06:44 +0000
commit4eadb146c18d9d5faaefc9c258d2aa715e3a1596 (patch)
tree135d0aa8d8734796588a69280543bf24a3b661e4 /src
parent76be215ee1271adb4a9ed04ee8b102c28e825798 (diff)
downloadopenocd_libswd-4eadb146c18d9d5faaefc9c258d2aa715e3a1596.tar.gz
openocd_libswd-4eadb146c18d9d5faaefc9c258d2aa715e3a1596.tar.bz2
openocd_libswd-4eadb146c18d9d5faaefc9c258d2aa715e3a1596.tar.xz
openocd_libswd-4eadb146c18d9d5faaefc9c258d2aa715e3a1596.zip
file not found SEGFAULT fix
git-svn-id: svn://svn.berlios.de/openocd/trunk@1030 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
-rw-r--r--src/helper/configuration.c4
-rw-r--r--src/target/target.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index a8d3bd22..be6f5662 100644
--- a/src/helper/configuration.c
+++ b/src/helper/configuration.c
@@ -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);
diff --git a/src/target/target.c b/src/target/target.c
index f530eb31..1ba4234a 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -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;