From c5df3ce144d27babd555da1a3bedded474de7bd0 Mon Sep 17 00:00:00 2001
From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Wed, 25 Jun 2008 19:23:55 +0000
Subject: Fixed bogus error message and plugged memory leak for the case when
there was no reset script.
git-svn-id: svn://svn.berlios.de/openocd/trunk@728 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
src/target/target.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'src/target')
diff --git a/src/target/target.c b/src/target/target.c
index 91fdd9ea..1be4885d 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -217,6 +217,8 @@ target_t* get_current_target(command_context_t *cmd_ctx)
static void execute_script(struct command_context_s *cmd_ctx, char *reset_script)
{
+ if (reset_script==NULL)
+ return;
FILE *script;
script = open_file_from_path(reset_script, "r");
if (!script)
@@ -237,7 +239,7 @@ int target_init_handler(struct target_s *target, enum target_event event, void *
{
struct command_context_s *cmd_ctx = priv;
- if ((event == TARGET_EVENT_HALTED) && (target->reset_script))
+ if (event == TARGET_EVENT_HALTED)
{
target_unregister_event_callback(target_init_handler, priv);
--
cgit v1.2.3