From: Vinson Lee Date: Sat, 17 Aug 2013 22:23:15 +0000 (-0700) Subject: nouveau: Copy m4x4 and m8x8 separately. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=57684d52e9a37a73dbcb6c71d04ea776b08bd003;p=mesa.git nouveau: Copy m4x4 and m8x8 separately. Silences Coverity "Out-of-bounds access" defect. Signed-off-by: Vinson Lee --- diff --git a/src/gallium/drivers/nouveau/nouveau_vp3_video_vp.c b/src/gallium/drivers/nouveau/nouveau_vp3_video_vp.c index 199c43d6d00..add998d98ef 100644 --- a/src/gallium/drivers/nouveau/nouveau_vp3_video_vp.c +++ b/src/gallium/drivers/nouveau/nouveau_vp3_video_vp.c @@ -363,7 +363,8 @@ nouveau_vp3_fill_picparm_h264_vp(struct nouveau_vp3_decoder *dec, h->field_order_cnt[0] = d->field_order_cnt[0]; h->field_order_cnt[1] = d->field_order_cnt[1]; memset(h->refs, 0, sizeof(h->refs)); - memcpy(h->m4x4, d->scaling_lists_4x4, sizeof(h->m4x4) + sizeof(h->m8x8)); + memcpy(h->m4x4, d->scaling_lists_4x4, sizeof(h->m4x4)); + memcpy(h->m8x8, d->scaling_lists_8x8, sizeof(h->m8x8)); h->u220 = 0; for (i = 0; i < d->num_ref_frames; ++i) { if (!d->ref[i])