From: Philip Nye Date: Mon, 14 Nov 2011 20:11:51 +0000 (+0000) Subject: gdb: Potential rounding error in reg_packet_size gdb_get_registers_packet X-Git-Tag: v0.6.0-rc1~418 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e5e2408680e860cce669b150374188985c442c41;p=openocd gdb: Potential rounding error in reg_packet_size gdb_get_registers_packet The calculation for reg_packet_size in gdb_get_registers_packet() could generate a wrong result in the case of multiple registers whose size is not a multiple of 8. The current calculation sums the sizes for all registers then rounds the result up to the next multiple of 8. Instead it should round each register size up individually and sum the results for all registers. Change-Id: Idfb5e5eeee0e69a6889dbe9769c0bf17feacb63b Signed-off-by: Spencer Oliver Reviewed-on: http://openocd.zylin.com/200 Tested-by: jenkins Reviewed-by: Andreas Fritiofson --- diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index cbc2b401..4dd9bd10 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -1058,12 +1058,12 @@ static int gdb_get_registers_packet(struct connection *connection, for (i = 0; i < reg_list_size; i++) { - reg_packet_size += reg_list[i]->size; + reg_packet_size += DIV_ROUND_UP(reg_list[i]->size, 8) * 2; } assert(reg_packet_size > 0); - reg_packet = malloc(DIV_ROUND_UP(reg_packet_size, 8) * 2); + reg_packet = malloc(reg_packet_size); reg_packet_p = reg_packet; for (i = 0; i < reg_list_size; i++) @@ -1077,13 +1077,13 @@ static int gdb_get_registers_packet(struct connection *connection, #ifdef _DEBUG_GDB_IO_ { char *reg_packet_p; - reg_packet_p = strndup(reg_packet, DIV_ROUND_UP(reg_packet_size, 8) * 2); + reg_packet_p = strndup(reg_packet, reg_packet_size); LOG_DEBUG("reg_packet: %s", reg_packet_p); free(reg_packet_p); } #endif - gdb_put_packet(connection, reg_packet, DIV_ROUND_UP(reg_packet_size, 8) * 2); + gdb_put_packet(connection, reg_packet, reg_packet_size); free(reg_packet); free(reg_list);