Re: [Mesa-dev] [PATCH] mesa/main: Fix tmp_row memory leak in texstore_rgba_integer.

2014-11-18 Thread Jason Ekstrand 
Pushed.  Thanks!
--Jason

On Sat, Nov 15, 2014 at 7:07 PM, Siavash Eliasi siavashser...@gmail.com
wrote:

  Please push it, I don't have write access.

 Best regards,
 Siavash Eliasi.


 On 11/15/2014 11:06 PM, Jason Ekstrand wrote:

  Good catch!

  Reviewed-by: Jason Ekstrand jason.ekstr...@intel.com

  Can you push or do you need me to?

 On Sat, Nov 15, 2014 at 11:02 AM, Siavash Eliasi siavashser...@gmail.com
 wrote:

 ---
  src/mesa/main/texstore.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)

 diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
 index f913e42..f858cef 100644
 --- a/src/mesa/main/texstore.c
 +++ b/src/mesa/main/texstore.c
 @@ -1667,8 +1667,10 @@ texstore_rgba_integer(TEXSTORE_PARAMS)

 assert(is_array  !normalized);

 -   if (!is_array)
 +   if (!is_array) {
 +  free(tmp_row);
return GL_FALSE;
 +   }

 invert_swizzle(dst2rgba, rgba2dst);
 compute_component_mapping(GL_RGBA, baseInternalFormat, base2rgba);
 --
 2.1.3

 ___
 mesa-dev mailing list
 mesa-dev@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/mesa-dev




___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] mesa/main: Fix tmp_row memory leak in texstore_rgba_integer.

2014-11-15 Thread Siavash Eliasi 
---
 src/mesa/main/texstore.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index f913e42..f858cef 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -1667,8 +1667,10 @@ texstore_rgba_integer(TEXSTORE_PARAMS)
 
assert(is_array  !normalized);
 
-   if (!is_array)
+   if (!is_array) {
+  free(tmp_row);
   return GL_FALSE;
+   }
 
invert_swizzle(dst2rgba, rgba2dst);
compute_component_mapping(GL_RGBA, baseInternalFormat, base2rgba);
-- 
2.1.3

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] mesa/main: Fix tmp_row memory leak in texstore_rgba_integer.

2014-11-15 Thread Jason Ekstrand 
Good catch!

Reviewed-by: Jason Ekstrand jason.ekstr...@intel.com

Can you push or do you need me to?

On Sat, Nov 15, 2014 at 11:02 AM, Siavash Eliasi siavashser...@gmail.com
wrote:

 ---
  src/mesa/main/texstore.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)

 diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
 index f913e42..f858cef 100644
 --- a/src/mesa/main/texstore.c
 +++ b/src/mesa/main/texstore.c
 @@ -1667,8 +1667,10 @@ texstore_rgba_integer(TEXSTORE_PARAMS)

 assert(is_array  !normalized);

 -   if (!is_array)
 +   if (!is_array) {
 +  free(tmp_row);
return GL_FALSE;
 +   }

 invert_swizzle(dst2rgba, rgba2dst);
 compute_component_mapping(GL_RGBA, baseInternalFormat, base2rgba);
 --
 2.1.3

 ___
 mesa-dev mailing list
 mesa-dev@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/mesa-dev

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev