From c56d791316c0bd4d6122a40eb416423f0deea796 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Tue, 9 Mar 2010 19:03:43 +0100
Subject: [PATCH] Fix handling of bad argument types in recorder.

---
 src/lj_record.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lj_record.c b/src/lj_record.c
index fa4180b9..44cb7317 100644
--- a/src/lj_record.c
+++ b/src/lj_record.c
@@ -1091,7 +1091,7 @@ typedef void (LJ_FASTCALL *RecordFunc)(jit_State *J, RecordFFData *rd);
 /* Get runtime value of int argument. */
 static int32_t argv2int(jit_State *J, TValue *o)
 {
-  if (tvisstr(o) && !lj_str_tonum(strV(o), o))
+  if (!tvisnum(o) && !(tvisstr(o) && lj_str_tonum(strV(o), o)))
     lj_trace_err(J, LJ_TRERR_BADTYPE);
   return lj_num2bit(numV(o));
 }
@@ -1103,7 +1103,8 @@ static GCstr *argv2str(jit_State *J, TValue *o)
     return strV(o);
   } else {
     GCstr *s;
-    lua_assert(tvisnum(o));
+    if (!tvisnum(o))
+      lj_trace_err(J, LJ_TRERR_BADTYPE);
     s = lj_str_fromnum(J->L, &o->n);
     setstrV(J->L, o, s);
     return s;