[Mesa-dev] [PATCH] i965: Don't write beyond allocated memory.

[Juha-Pekka Heikkila]

Signed-off-by: Juha-Pekka Heikkila 
---
 src/mesa/drivers/dri/i965/brw_eu_validate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_eu_validate.c 
b/src/mesa/drivers/dri/i965/brw_eu_validate.c
index eb57962..2de2ea1 100644
--- a/src/mesa/drivers/dri/i965/brw_eu_validate.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_validate.c
@@ -39,7 +39,7 @@ cat(struct string *dest, const struct string src)
 {
dest->str = realloc(dest->str, dest->len + src.len + 1);
memcpy(dest->str + dest->len, src.str, src.len);
-   dest->str[dest->len + src.len + 1] = '\0';
+   dest->str[dest->len + src.len] = '\0';
dest->len = dest->len + src.len;
 }
 #define CAT(dest, src) cat(, (struct string){src, strlen(src)})
-- 
1.9.1

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

Re: [Mesa-dev] [PATCH] i965: Don't write beyond allocated memory.

[Eduardo Lima Mitev]

On 11/13/2015 12:36 PM, Juha-Pekka Heikkila wrote:
> Signed-off-by: Juha-Pekka Heikkila 
> ---
>  src/mesa/drivers/dri/i965/brw_eu_validate.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/brw_eu_validate.c 
> b/src/mesa/drivers/dri/i965/brw_eu_validate.c
> index eb57962..2de2ea1 100644
> --- a/src/mesa/drivers/dri/i965/brw_eu_validate.c
> +++ b/src/mesa/drivers/dri/i965/brw_eu_validate.c
> @@ -39,7 +39,7 @@ cat(struct string *dest, const struct string src)
>  {
> dest->str = realloc(dest->str, dest->len + src.len + 1);
> memcpy(dest->str + dest->len, src.str, src.len);
> -   dest->str[dest->len + src.len + 1] = '\0';
> +   dest->str[dest->len + src.len] = '\0';
> dest->len = dest->len + src.len;
>  }
>  #define CAT(dest, src) cat(, (struct string){src, strlen(src)})
> 

Good catch!

Reviewed-by: Eduardo Lima Mitev 

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

Re: [Mesa-dev] [PATCH] i965: Don't write beyond allocated memory.

[Matt Turner]

On Fri, Nov 13, 2015 at 3:36 AM, Juha-Pekka Heikkila
 wrote:
> Signed-off-by: Juha-Pekka Heikkila 
> ---
>  src/mesa/drivers/dri/i965/brw_eu_validate.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_eu_validate.c 
> b/src/mesa/drivers/dri/i965/brw_eu_validate.c
> index eb57962..2de2ea1 100644
> --- a/src/mesa/drivers/dri/i965/brw_eu_validate.c
> +++ b/src/mesa/drivers/dri/i965/brw_eu_validate.c
> @@ -39,7 +39,7 @@ cat(struct string *dest, const struct string src)
>  {
> dest->str = realloc(dest->str, dest->len + src.len + 1);
> memcpy(dest->str + dest->len, src.str, src.len);
> -   dest->str[dest->len + src.len + 1] = '\0';
> +   dest->str[dest->len + src.len] = '\0';
> dest->len = dest->len + src.len;
>  }
>  #define CAT(dest, src) cat(, (struct string){src, strlen(src)})
> --

Nice. Thanks for catching that.

Reviewed-by: Matt Turner 

(I'll push this)
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev