From 4eadb146c18d9d5faaefc9c258d2aa715e3a1596 Mon Sep 17 00:00:00 2001
From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Wed, 8 Oct 2008 11:06:44 +0000
Subject: [PATCH] file not found SEGFAULT fix
git-svn-id: svn://svn.berlios.de/openocd/trunk@1030 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
src/helper/configuration.c | 4 +++-
src/target/target.c | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index a8d3bd227..be6f56620 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 f530eb313..1ba4234af 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;
--
GitLab