kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Eolian/Generator: support NULL pointers for return values. 

When an Eo operation returns a value, this one is stored in the last
parameter as an out parameter.
In case the caller doesn't set a pointer there, the storing will be done
in a NULL pointer and will bring to a segfault.

The generator has been modified to handle this case. Now, if the ret
pointer is NULL, the value will not be returned.
This commit is contained in:
Daniel Zaoui 2014-03-10 13:19:24 +02:00
parent 4e33fd16e2
commit d96c429179
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/eolian/eo1_generator.c
View File

@ -117,6 +117,7 @@ _eo_obj_@#class_@#func(Eo *obj, void *_pd, va_list *list@#list_unused)\n\
{\n\
@#list_vars\
@#ret_param_@#class_@#func(obj, _pd@#list_params);\n\
@#return_ret\
}\n\
";
@ -428,16 +429,19 @@ eo1_bind_func_generate(const char *classname, Eolian_Function funcid, Eolian_Fun
ret_const?"const ":"",
rettype, had_star?"":" ");
Eina_Strbuf *ret_param = eina_strbuf_new();
eina_strbuf_append_printf(ret_param, "*%s = ", retname);
if (rettype) eina_strbuf_append_printf(ret_param, "%s _%s = ", rettype, retname);
eina_strbuf_replace_all(fbody, "@#ret_param", eina_strbuf_string_get(ret_param));
sprintf(tmpstr, "%s%s", ret_const?"const ":"", rettype);
eina_strbuf_replace_all(fbody, "@#ret_type", tmpstr);
sprintf(tmpstr, " if (%s) *%s = _%s;\n", retname, retname, retname);
eina_strbuf_replace_all(fbody, "@#return_ret", tmpstr);
eina_strbuf_free(ret_param);
}
else
{
eina_strbuf_replace_all(fbody, "@#ret_param", "");
eina_strbuf_replace_all(fbody, "@#ret_type", "void");
eina_strbuf_replace_all(fbody, "@#return_ret", "");
}
if (eina_list_count(eolian_parameters_list_get(funcid)) == 0 &&