From 5aa01b46e41dcdbbd2dad6d1b7ecce9a60b8ce7a Mon Sep 17 00:00:00 2001 From: Josh Haberman Date: Mon, 23 Jan 2017 16:56:39 -0800 Subject: A couple more fixes. --- upb/def.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'upb') diff --git a/upb/def.c b/upb/def.c index 080cd92..5fe9e14 100644 --- a/upb/def.c +++ b/upb/def.c @@ -378,13 +378,14 @@ bool _upb_def_validate(upb_def *const*defs, size_t n, upb_status *s) { } else if (def->type == UPB_DEF_FIELD) { upb_status_seterrmsg(s, "standalone fielddefs can not be frozen"); goto err; - } else if (def->type == UPB_DEF_ENUM) { - if (!upb_validate_enumdef(upb_dyncast_enumdef(def), s)) { - goto err; - } } else { /* Set now to detect transitive closure in the second pass. */ def->came_from_user = true; + + if (def->type == UPB_DEF_ENUM && + !upb_validate_enumdef(upb_dyncast_enumdef(def), s)) { + goto err; + } } } -- cgit v1.2.3