Merge pull request #184 from lukego/ctype-no-loop

lj_ctype.c: Detect loops in ctype_repr()
snabbco · Aug 10, 2018 · 5d235e6 · 5d235e6
2 parents 9fac632 + 3f9db9e
commit 5d235e6
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/lj_ctype.c b/src/lj_ctype.c
@@ -447,6 +447,7 @@ static void ctype_repr(CTRepr *ctr, CTypeID id)
   for (;;) {
     CTInfo info = ct->info;
     CTSize size = ct->size;
+    CType *newct;
     switch (ctype_type(info)) {
     case CT_NUM:
       if ((info & CTF_BOOL)) {
@@ -532,7 +533,13 @@ static void ctype_repr(CTRepr *ctr, CTypeID id)
       ctr->ok = 0;
       return;
     }
-    ct = ctype_get(ctr->cts, ctype_cid(info));
+    newct = ctype_get(ctr->cts, ctype_cid(info));
+    /* Detect ctypes that are not OK due to looping. */
+    if (newct == ct) {
+      ctr->ok = 0;
+      return;
+    }
+    ct = newct;
   }
 }