file not found SEGFAULT fix

git-svn-id: svn://svn.berlios.de/openocd/trunk@1030 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index a8d3bd2270b2c292d49c0e840ace2542dd5a6519..be6f56620cc45bce29038029bccb6b0defac2972 100644 (file)
--- 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 f530eb31334877a4c333db8b67bdcc2d79946232..1ba4234af331f20d5b5520e28406241b6d3ba9a2 100644 (file)
--- 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;