summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2013-06-28 09:38:05 +0100
committerStefan Schmidt <s.schmidt@samsung.com>2013-06-28 14:03:47 +0100
commitae66fce6900bcb24bf572f0b1ae80dd4c7e2f5a3 (patch)
tree0937dfb3f138cb3b157cfe05fd3c4d44e5874479
parentec1be1025adf11401ec5d2ac6ee532368d828cbb (diff)
downloadeet-ae66fce6900bcb24bf572f0b1ae80dd4c7e2f5a3.tar.gz
eet_image: Initialize bigend_data to NULL to avoid segfaults.
We are not initializing bigend_data but freeing it later unconditional which might result in segfaults. Better play safe here and set it to NULL. Fixes phab issue T195.
-rw-r--r--ChangeLog6
-rw-r--r--NEWS1
-rw-r--r--src/lib/eet_image.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fd313e9..da10520 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -686,6 +686,10 @@
* 1.7.6 release
-2013-06-011 Stefan Schmidt
+2013-06-11 Stefan Schmidt
* Fix memory leak in eet_image
+
+2013-06-28 Stefan Schmidt
+
+ * Fix segfault in edje_cc in some case when using eet
diff --git a/NEWS b/NEWS
index 390aac6..fcd4089 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Changes since Eet 1.7.7:
Fixes:
* Fix memory leak in eet_image.
+ * With segfault with edje_cc in some cases
Eet 1.7.7
diff --git a/src/lib/eet_image.c b/src/lib/eet_image.c
index 4bf515c..1756973 100644
--- a/src/lib/eet_image.c
+++ b/src/lib/eet_image.c
@@ -746,7 +746,7 @@ eet_data_image_lossless_compressed_convert(int *size,
{
unsigned char *d, *comp;
- int *header, *bigend_data, ret, ok = 1;
+ int *header, *bigend_data = NULL, ret, ok = 1;
uLongf buflen = 0;
buflen = (((w * h * 101) / 100) + 3) * 4;