discomfitor pushed a commit to branch master.
commit 1b58e6cf8e89fcb9e2a89e21b329ddfc12efaaf3
Author: Mike Blumenkrantz <[email protected]>
Date: Thu May 23 13:29:34 2013 +0100
fix shape rect related crash from b738b9fe5f062cb8c9ba6fbb9e90e3239cce2915
---
src/bin/e_border.c | 2 +-
src/bin/e_container.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index af33ee7..b03fbba 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -7720,6 +7720,7 @@ _e_border_eval0(E_Border *bd)
if (!bd->bordername)
bd->client.border.changed = 1;
}
+ free(rects);
}
else
{
@@ -7732,7 +7733,6 @@ _e_border_eval0(E_Border *bd)
ecore_x_window_shape_input_rectangles_set(bd->win, rects,
num);
e_container_shape_input_rects_set(bd->shape, (Eina_Rectangle
*)rects, num);
}
- free(rects);
}
else
{
diff --git a/src/bin/e_container.c b/src/bin/e_container.c
index abcf1ce..144e892 100644
--- a/src/bin/e_container.c
+++ b/src/bin/e_container.c
@@ -463,7 +463,7 @@ e_container_shape_rects_set(E_Container_Shape *es,
Eina_Rectangle *rects, int nu
((int)rects[0].w == es->w) &&
((int)rects[0].h == es->h))
{
- /* do nothing */
+ free(rects);
}
else if (rects)
{
@@ -486,7 +486,7 @@ e_container_shape_input_rects_set(E_Container_Shape *es,
Eina_Rectangle *rects,
((int)rects[0].w == es->w) &&
((int)rects[0].h == es->h))
{
- /* do nothing */
+ free(rects);
}
else if (rects)
{
--
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
