summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2016-12-07 10:10:42 -0600
committerDerek Foreman <derekf@osg.samsung.com>2016-12-07 10:10:42 -0600
commiteafb05c58a0c5c724da484c2d745e7d08aa3fdc4 (patch)
treeb4180ccdf512f659507ffd53d226d270eec2234b
parent5424cdbd810042ba59e71bec6b8d91cb6a2c3e9c (diff)
downloadefl-eafb05c58a0c5c724da484c2d745e7d08aa3fdc4.tar.gz
evas - software generic - fix crash
Commit fcef8d8392b8c8d1d7b96baacaf5e7e89fcf6b45 breaks any evas engine that frees/NULLs its own outbuf before calling evas_render_engine_software_generic_update() We should unconditionally set the outbuf, we only need to do the free conditionally.
-rw-r--r--src/modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h b/src/modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h
index 59537c99d9..05863cd336 100644
--- a/src/modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h
+++ b/src/modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h
@@ -177,11 +177,8 @@ evas_render_engine_software_generic_update(Render_Engine_Software_Generic *re,
Outbuf *ob,
int w, int h)
{
- if ((re->ob) && (re->ob != ob))
- {
- re->outbuf_free(re->ob);
- re->ob = ob;
- }
+ if ((re->ob) && (re->ob != ob)) re->outbuf_free(re->ob);
+ re->ob = ob;
evas_common_tilebuf_free(re->tb);
re->tb = evas_common_tilebuf_new(w, h);