[Openocd-svn] r1915 - trunk/src/svf

[<zw...@ma...>]

Author: zwelch
Date: 2009-05-26 03:27:56 +0200 (Tue, 26 May 2009)
New Revision: 1915

Modified:
   trunk/src/svf/svf.c
Log:
SimonQian <sim...@Si...>, 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


Modified: trunk/src/svf/svf.c
===================================================================
--- trunk/src/svf/svf.c	2009-05-26 01:22:23 UTC (rev 1914)
+++ trunk/src/svf/svf.c	2009-05-26 01:27:56 UTC (rev 1915)
@@ -918,6 +918,27 @@
 			}
 			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)
 		{