[Openocd-svn] r1751 - trunk/src/jtag

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-05-12 08:17:22 +0200 (Tue, 12 May 2009)
New Revision: 1751

Modified:
   trunk/src/jtag/jtag.c
Log:
fix ancient bug & SEGFAULT in irscan

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-05-12 04:52:15 UTC (rev 1750)
+++ trunk/src/jtag/jtag.c	2009-05-12 06:17:22 UTC (rev 1751)
@@ -2889,9 +2889,11 @@
 		}
 	}
 
-	fields = malloc(sizeof(scan_field_t) * argc / 2);
+	int num_fields= num_fields;
 
-	for (i = 0; i < argc / 2; i++)
+	fields = malloc(sizeof(scan_field_t) * num_fields);
+
+	for (i = 0; i < num_fields; i++)
 	{
 		tap = jtag_TapByString( args[i*2] );
 		if (tap==NULL)
@@ -2901,19 +2903,20 @@
 		}
 		int field_size = tap->ir_length;
 		fields[i].tap = tap;
+		fields[i].num_bits = field_size;
 		fields[i].out_value = malloc(CEIL(field_size, 8));
 		buf_set_u32(fields[i].out_value, 0, field_size, strtoul(args[i*2+1], NULL, 0));
 		fields[i].in_value = NULL;
 	}
 
-	jtag_add_ir_scan(argc / 2, fields, TAP_INVALID);
+	jtag_add_ir_scan(num_fields, fields, TAP_INVALID);
 	/* did we have an endstate? */
 	if (endstate != TAP_INVALID)
 		jtag_add_end_state(endstate);
 
 	jtag_execute_queue();
 
-	for (i = 0; i < argc / 2; i++)
+	for (i = 0; i < num_fields; i++)
 		free(fields[i].out_value);
 
 	free (fields);