From: Chad Versace Date: Wed, 19 Nov 2014 05:11:26 +0000 (-0800) Subject: i965: Use safer pointer arithmetic in gather_oa_results() X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=414be86c96836b35571185da776d2bce1b620c6a;p=mesa.git i965: Use safer pointer arithmetic in gather_oa_results() This patch reduces the likelihood of pointer arithmetic overflow bugs in gather_oa_results(), like the one fixed by b69c7c5dac. I haven't yet encountered any overflow bugs in the wild along this patch's codepath. But I get nervous when I see code patterns like this: (void*) + (int) * (int) I smell 32-bit overflow all over this code. This patch retypes 'snapshot_size' to 'ptrdiff_t', which should fix any potential overflow. Reviewed-by: Kenneth Graunke Signed-off-by: Chad Versace --- diff --git a/src/mesa/drivers/dri/i965/brw_performance_monitor.c b/src/mesa/drivers/dri/i965/brw_performance_monitor.c index edfa3d2ec2a..e683e40e55f 100644 --- a/src/mesa/drivers/dri/i965/brw_performance_monitor.c +++ b/src/mesa/drivers/dri/i965/brw_performance_monitor.c @@ -907,7 +907,7 @@ gather_oa_results(struct brw_context *brw, return; } - const int snapshot_size = brw->perfmon.entries_per_oa_snapshot; + const ptrdiff_t snapshot_size = brw->perfmon.entries_per_oa_snapshot; /* First, add the contributions from the "head" interval: * (snapshot taken at BeginPerfMonitor time,