summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@canonical.com>2013-11-07 13:30:19 +0100
committerMaarten Lankhorst <maarten.lankhorst@canonical.com>2013-11-07 13:37:49 +0100
commit482abbfafb56cbceaf5355c026434e638cddd0f1 (patch)
treeb21f2eabbab9237aaa1dc6eab86ea7f31f1ffa39
parentebff7a1e2286781c6fc23e5ed9bcbf177603569c (diff)
nouveau: prevent undefined behavior in nouveau_pushbuf_reloc with gcc-4.8
Reported-by: ronald645@gmail.com Bisected-by (gcc): Andreas Radke <a.radke@arcor.de> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71116 Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
-rw-r--r--nouveau/pushbuf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/nouveau/pushbuf.c b/nouveau/pushbuf.c
index 0fd0c47a..4f77881b 100644
--- a/nouveau/pushbuf.c
+++ b/nouveau/pushbuf.c
@@ -739,7 +739,8 @@ void
nouveau_pushbuf_reloc(struct nouveau_pushbuf *push, struct nouveau_bo *bo,
uint32_t data, uint32_t flags, uint32_t vor, uint32_t tor)
{
- *push->cur++ = pushbuf_krel(push, bo, data, flags, vor, tor);
+ *push->cur = pushbuf_krel(push, bo, data, flags, vor, tor);
+ push->cur++;
}
int