Merge upstream commit to fix svace

WGID: 84664

commit 7c71cf6d59700df1a46661aab646cd17a4882f9c
Author:     Carsten Haitzler (Rasterman) <raster@rasterman.com>
AuthorDate: Mon Jan 11 16:42:05 2016 +0900
Commit:     Carsten Haitzler (Rasterman) <raster@rasterman.com>
CommitDate: Mon Jan 11 16:42:05 2016 +0900

    elm entry: check for null return from eina_rectangle_new

    this will handle if eina_rectangle_new can't allocate a rect
    (basically never will happen...)

    @fix

Change-Id: Idfdb5119ac6032a689b7f5078bf335871dc6376f

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 2c5309eb9a075bc889e92de8a5e8c1133483065c..38f7206fc5f60c5115ca5ea05739d84729ba82ef 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -1141,6 +1141,7 @@ _viewport_region_get(Evas_Object *obj)
    Eina_Rectangle *rect = eina_rectangle_new(0, 0, 0, 0);
    Evas_Object *parent;
 
+   if (!rect) return NULL;
    if (sd->scroll)
      eo_do(obj, elm_interface_scrollable_content_viewport_geometry_get
            (&rect->x, &rect->y, &rect->w, &rect->h));