From 36fcf271bea303f4248d8ce4848aad5ae766fba7 Mon Sep 17 00:00:00 2001 From: cedric Date: Thu, 30 Aug 2012 11:28:07 +0000 Subject: [PATCH] edje: check the number of parameter for edc. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/edje@75876 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- ChangeLog | 4 ++++ NEWS | 13 +++++++++++++ src/bin/edje_cc_handlers.c | 2 ++ src/bin/edje_cc_out.c | 1 - 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d15ca53..a900a08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -577,3 +577,7 @@ 2012-08-30 Carsten Haitzler (The Rasterman) 1.7.0 release + +2012-08-30 Cedric Bail + + * Check the number of parameter for image in edc. diff --git a/NEWS b/NEWS index 75c558e..ae9b9e5 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,16 @@ +Edje 1.8.0 + +Changes since Edje 1.8.0: +------------------------- + +Additions: + +Improvements: + * Check the number of parameter for image in edc. + +Fixes: + + Edje 1.7.0 Changes since Edje 1.2.0: diff --git a/src/bin/edje_cc_handlers.c b/src/bin/edje_cc_handlers.c index a057416..2f8a84b 100644 --- a/src/bin/edje_cc_handlers.c +++ b/src/bin/edje_cc_handlers.c @@ -1238,6 +1238,8 @@ st_images_image(void) unsigned int i; int v; + check_min_arg_count(2); + if (!edje_file->image_dir) edje_file->image_dir = mem_alloc(SZ(Edje_Image_Directory)); diff --git a/src/bin/edje_cc_out.c b/src/bin/edje_cc_out.c index 041bcf7..9d327b1 100644 --- a/src/bin/edje_cc_out.c +++ b/src/bin/edje_cc_out.c @@ -225,7 +225,6 @@ check_image_part_desc(Edje_Part_Collection *pc, Edje_Part *ep, { unsigned int i; - /* FIXME: This check sounds like not a useful one */ if (epd->image.id == -1 && epd->common.visible) WRN("Collection %s(%i): image attributes missing for " "part \"%s\", description \"%s\" %f", -- 2.7.4