From: zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Tue, 26 May 2009 01:27:56 +0000 (+0000)
Subject: SimonQian <simonqian@SimonQian.com>, reported by R.Doss:
X-Git-Tag: v0.2.0~595
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3848774d33fd8a25f68c7522e0f956a7371060c5;p=openocd

SimonQian <simonqian@SimonQian.com>, reported by R.Doss:

This patch fixes a segfault when TDO was not received in XXR command:
- allocate space for the value and mask anyway
- clear the mask to zero to effectively skip the output comparison step


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

diff --git a/src/svf/svf.c b/src/svf/svf.c
index caaacaba..62599c64 100644
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -918,6 +918,27 @@ static int svf_run_command(struct command_context_s *cmd_ctx, char *cmd_str)
 			}
 			buf_set_ones(xxr_para_tmp->mask, xxr_para_tmp->len);
 		}
+		// If TDO is absent, no comparison is needed, set the mask to 0
+		if (!(xxr_para_tmp->data_mask & XXR_TDO))
+		{
+			if (NULL == xxr_para_tmp->tdo)
+			{
+				if (ERROR_OK != svf_adjust_array_length(&xxr_para_tmp->tdo, i_tmp, xxr_para_tmp->len))
+				{
+					LOG_ERROR("fail to adjust length of array");
+					return ERROR_FAIL;
+				}
+			}
+			if (NULL == xxr_para_tmp->mask)
+			{
+				if (ERROR_OK != svf_adjust_array_length(&xxr_para_tmp->mask, i_tmp, xxr_para_tmp->len))
+				{
+					LOG_ERROR("fail to adjust length of array");
+					return ERROR_FAIL;
+				}
+			}
+			memset(xxr_para_tmp->mask, 0, (xxr_para_tmp->len + 7) >> 3);
+		}
 		// do scan if necessary
 		if (SDR == command)
 		{