From: Jian Zhao <jian.j.zhao@intel.com>
Date: Wed, 5 Jan 2011 02:41:20 +0000 (+0800)
Subject: mesa: fix an error in uniform arrays in row calculating.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2a7380e9c3a040356599a5b7740aa24e067fc1f5;p=mesa.git

mesa: fix an error in uniform arrays in row calculating.

Fix the error in uniform row calculating, it may alloc one line
more which may cause out of range on memory usage, sometimes program
aborted when free the memory.

NOTE: This is a candidate for 7.9 and 7.10 branches.

Signed-off-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
index 58e6bafc918..aee2e6b4e9b 100644
--- a/src/mesa/main/uniforms.c
+++ b/src/mesa/main/uniforms.c
@@ -513,7 +513,7 @@ get_uniform_rows_cols(const struct gl_program_parameter *p,
          *cols = p->Size;
       }
       else {
-         *rows = p->Size / 4 + 1;
+         *rows = (p->Size + 3) / 4;
          if (p->Size % 4 == 0)
             *cols = 4;
          else