[Tizen-submit] 19722: Changes to Tizen:Generic/edje

[noreply at tizen.org]

Hi,
Eduardo Lima (Etrunko) have made the following changes to edje in project Tizen:Generic. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #19722

  submit:       Tizen:Generic:build/edje(cleanup) -> Tizen:Generic


Message:
Submitter: Eduardo Lima (Etrunko) <eduardo.lima at intel.com>
Comments: Fix for tizen IVI bug https://bugs.tizen.org/jira/browse/TIVI-2144
Git project: platform/upstream/edje
Tag: submit/tizen/20140116.170845
Commit: a7d4e1ec6c0b973431b56b6a92bb960a2ee09693 TIVI-2144 : Fix Segfault during popup process creation

State:   new        2014-01-16T17:08:27 tizenrobot
Comment: <no comment>
changes files:
--------------

new:
----
  0003-TIVI-2144-Fix-Segfault-during-popup-process-creation.patch

spec files:
-----------
--- edje.spec
+++ edje.spec
@@ -1,5 +1,5 @@
 Name:           edje
-VCS:            platform/upstream/edje#9e59edb4e174cae588c806b1e20a88fc8b83edcb
+VCS:            platform/upstream/edje#a7d4e1ec6c0b973431b56b6a92bb960a2ee09693
 Version:        1.7.8
 Release:        1
 License:        BSD 2-clause
@@ -11,6 +11,7 @@
 # Patches auto-generated by git-buildpackage:
 Patch0:         0001-edje_cc-Add-dd-data_dir-option.patch
 Patch1:         0002-New-embryo-function-get_program_id.patch
+Patch2:         0003-TIVI-2144-Fix-Segfault-during-popup-process-creation.patch
 BuildRequires:  doxygen
 BuildRequires:  python-devel
 BuildRequires:  pkgconfig(ecore)
@@ -64,6 +65,8 @@
 %patch0 -p1
 # 0002-New-embryo-function-get_program_id.patch
 %patch1 -p1
+# 0003-TIVI-2144-Fix-Segfault-during-popup-process-creation.patch
+%patch2 -p1
 cp %{SOURCE1001} .
 
 %build

other changes:
--------------

++++++ 0003-TIVI-2144-Fix-Segfault-during-popup-process-creation.patch (new)
--- 0003-TIVI-2144-Fix-Segfault-during-popup-process-creation.patch
+++ 0003-TIVI-2144-Fix-Segfault-during-popup-process-creation.patch
@@ -0,0 +1,55 @@
+From: Baptiste DURAND <baptiste.durand at open.eurogiciel.org>
+Date: Thu, 16 Jan 2014 16:56:13 +0100
+Subject: TIVI-2144 : Fix Segfault during popup process creation
+
+Add pointer test to allow the function call _edje_part_recalc_single_textblock with null args
+
+-> backport test pointer from current EFL version (1.8.4)
+
+Change-Id: Ie7d183110075f6f32936cb66203e2a16976e9aca
+Signed-off-by: Baptiste DURAND <baptiste.durand at open.eurogiciel.org>
+---
+ src/lib/edje_calc.c |   16 +++++++++-------
+ 1 files changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/src/lib/edje_calc.c b/src/lib/edje_calc.c
+index db9ab1d..5a36b8b 100644
+--- a/src/lib/edje_calc.c
++++ b/src/lib/edje_calc.c
+@@ -1259,11 +1259,12 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
+                                                          &ins_r, &ins_t, &ins_b);
+                   mw = ins_l + tw + ins_r;
+                   mh = ins_t + th + ins_b;
+-                  if (chosen_desc->text.min_x)
++
++                 if (minw && chosen_desc->text.min_x)
+                     {
+                        if (mw > *minw) *minw = mw;
+                     }
+-                  if (chosen_desc->text.min_y)
++                  if (minh && chosen_desc->text.min_y)
+                     {
+                        if (mh > *minh) *minh = mh;
+                     }
+@@ -1285,15 +1286,16 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
+                                                     &ins_t, &ins_b);
+              mw = ins_l + tw + ins_r;
+              mh = ins_t + th + ins_b;
+-             if (chosen_desc->text.max_x)
++ 
++             if (maxw && chosen_desc->text.max_x)
+                {
+                   if (mw > *maxw) *maxw = mw;
+-                  if (*maxw < *minw) *maxw = *minw;

Please refer to OBS webUI for more details about this SR.