Bring lua extension up to date with new symtab APIs.

2 files changed, 6 insertions, 2 deletions

diff --git a/src/upb.h b/src/upb.h
index 0698748..fe576eb 100644
--- a/src/upb.h
+++ b/src/upb.h
@@ -265,6 +265,8 @@ INLINE void upb_status_init(upb_status *status) {
 
 void upb_status_uninit(upb_status *status);
 
+// Caller owns a ref on the returned string.
+upb_string *upb_status_tostring(upb_status *status);
 void upb_printerr(upb_status *status);
 void upb_clearerr(upb_status *status);
 void upb_seterr(upb_status *status, enum upb_status_code code, const char *msg,
diff --git a/src/upb_decoder.c b/src/upb_decoder.c
index 40ab790..8b10522 100644
--- a/src/upb_decoder.c
+++ b/src/upb_decoder.c
@@ -327,7 +327,7 @@ void upb_decoder_run(upb_src *src, upb_status *status) {
   //d->bytes_parsed_slow = 0;
 
 // TODO: handle UPB_SKIPSUBMSG
-#define CHECK_FLOW(expr) if ((expr) == UPB_BREAK) { /*assert(!upb_ok(status));*/ goto err; }
+#define CHECK_FLOW(expr) if ((expr) == UPB_BREAK) { /*assert(!upb_ok(status));*/ goto callback_err; }
 #define CHECK(expr) if (!expr) { assert(!upb_ok(status)); goto err; }
 
   CHECK_FLOW(upb_dispatch_startmsg(&d->dispatcher));
@@ -469,11 +469,13 @@ void upb_decoder_run(upb_src *src, upb_status *status) {
     CHECK_FLOW(upb_dispatch_value(&d->dispatcher, f, val));
   }
 
-err:
+callback_err:
   upb_copyerr(status, d->dispatcher.top->handlers.status);
   if (upb_ok(status)) {
     upb_seterr(status, UPB_ERROR, "Callback returned UPB_BREAK");
   }
+err:
+  assert(!upb_ok(status));
 }
 
 void upb_decoder_sethandlers(upb_src *src, upb_handlers *handlers) {