From: Andreas Fritiofson Date: Mon, 30 Sep 2013 21:33:59 +0000 (+0200) Subject: smp: Fix byte order bug X-Git-Tag: v0.8.0-rc1~180 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4f6f065201e908497f087769dcdff1728466df4e;p=openocd smp: Fix byte order bug Found by grepping for pointer casts. Also rewrite to reduce scope and allocate the few bytes needed on stack instead of on heap. Change-Id: Ia2a369fb612e807b981ee60ebcfd9c09c2fbdf4c Signed-off-by: Andreas Fritiofson Reviewed-on: http://openocd.zylin.com/1779 Tested-by: jenkins Reviewed-by: Mathias Küster Reviewed-by: Spencer Oliver --- diff --git a/src/target/smp.c b/src/target/smp.c index 39a95337..d14ceba9 100644 --- a/src/target/smp.c +++ b/src/target/smp.c @@ -59,18 +59,16 @@ int gdb_read_smp_packet(struct connection *connection, char *packet, int packet_size) { struct target *target = get_target_from_connection(connection); - uint32_t len = sizeof(int32_t); - uint8_t *buffer; - char *hex_buffer; int retval = ERROR_OK; if (target->smp) { if (strncmp(packet, "jc", 2) == 0) { - hex_buffer = malloc(len * 2 + 1); - buffer = (uint8_t *)&target->gdb_service->core[0]; - int pkt_len = hexify(hex_buffer, (char *)buffer, len, len * 2 + 1); + const uint32_t len = sizeof(target->gdb_service->core[0]); + char hex_buffer[len * 2 + 1]; + char buffer[len]; + buf_set_u32(buffer, 0, len * 8, target->gdb_service->core[0]); + int pkt_len = hexify(hex_buffer, buffer, sizeof(buffer), sizeof(hex_buffer)); retval = gdb_put_packet(connection, hex_buffer, pkt_len); - free(hex_buffer); } } else retval = gdb_put_packet(connection, "E01", 3);