Fix strncat() use in voodoo_add_status_info().

This commit is contained in:
SarahW 2017-08-16 19:38:24 +01:00
commit bb64507b7b

View file

@ -7390,19 +7390,19 @@ static void voodoo_add_status_info(char *s, int max_len, void *p)
{ {
sprintf(temps2, "%f%% CPU (%f%% real)\n", sprintf(temps2, "%f%% CPU (%f%% real)\n",
((double)voodoo->render_time[1] * 100.0) / timer_freq, ((double)voodoo->render_time[1] * 100.0) / status_diff); ((double)voodoo->render_time[1] * 100.0) / timer_freq, ((double)voodoo->render_time[1] * 100.0) / status_diff);
strncat(temps, temps2, 512); strncat(temps, temps2, sizeof(temps)-1);
} }
if (voodoo_set->nr_cards == 2) if (voodoo_set->nr_cards == 2)
{ {
sprintf(temps2, "%f%% CPU (%f%% real)\n", sprintf(temps2, "%f%% CPU (%f%% real)\n",
((double)voodoo_slave->render_time[0] * 100.0) / timer_freq, ((double)voodoo_slave->render_time[0] * 100.0) / status_diff); ((double)voodoo_slave->render_time[0] * 100.0) / timer_freq, ((double)voodoo_slave->render_time[0] * 100.0) / status_diff);
strncat(temps, temps2, 512); strncat(temps, temps2, sizeof(temps)-1);
if (voodoo_slave->render_threads == 2) if (voodoo_slave->render_threads == 2)
{ {
sprintf(temps2, "%f%% CPU (%f%% real)\n", sprintf(temps2, "%f%% CPU (%f%% real)\n",
((double)voodoo_slave->render_time[1] * 100.0) / timer_freq, ((double)voodoo_slave->render_time[1] * 100.0) / status_diff); ((double)voodoo_slave->render_time[1] * 100.0) / timer_freq, ((double)voodoo_slave->render_time[1] * 100.0) / status_diff);
strncat(temps, temps2, 512); strncat(temps, temps2, sizeof(temps)-1);
} }
} }
strncat(s, temps, max_len); strncat(s, temps, max_len);