summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2014-08-07 16:43:35 +0100
committerDaniel Kolesa <d.kolesa@samsung.com>2014-08-07 16:43:35 +0100
commit46c08b19660bfe1b0d1737bb7c2bafe4f642010b (patch)
tree39f0d5ba5b7614eef7b2f5b7dbb1a6bc9a658886
parent8fe45877a27292c018a81ab3b3ede6f770a9667d (diff)
downloadefl-devs/q66/eolian_exprs.tar.gz
eolian: fix null serializationdevs/q66/eolian_exprs
-rw-r--r--src/lib/eolian/database_expr.c2
-rw-r--r--src/lib/eolian/database_expr_api.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/eolian/database_expr.c b/src/lib/eolian/database_expr.c
index 0a75eda1aa..48889a6823 100644
--- a/src/lib/eolian/database_expr.c
+++ b/src/lib/eolian/database_expr.c
@@ -540,6 +540,8 @@ database_expr_eval(const Eolian_Expression *expr, Eolian_Expression_Mask mask,
*outval = eina_value_new(EINA_VALUE_TYPE_UCHAR);
eina_value_set(*outval, out.value.b);
break;
+ case EOLIAN_EXPR_NULL:
+ break;
default:
return EOLIAN_EXPR_UNKNOWN;
}
diff --git a/src/lib/eolian/database_expr_api.c b/src/lib/eolian/database_expr_api.c
index aee655e022..c1b2f63264 100644
--- a/src/lib/eolian/database_expr_api.c
+++ b/src/lib/eolian/database_expr_api.c
@@ -144,7 +144,8 @@ EAPI Eina_Stringshare *
eolian_expression_value_to_literal(const Eina_Value *v,
Eolian_Expression_Type etp)
{
- EINA_SAFETY_ON_NULL_RETURN_VAL(v, NULL);
+ if (etp != EOLIAN_EXPR_NULL)
+ EINA_SAFETY_ON_NULL_RETURN_VAL(v, NULL);
switch (etp)
{
case EOLIAN_EXPR_BOOL: