2 files changed, 11 insertions, 0 deletions

diff --git a/llex.c b/llex.c
index b0bab377..bb81cec4 100644
--- a/llex.c
+++ b/llex.c
@@ -228,6 +228,8 @@ static int read_numeral (LexState *ls, SemInfo *seminfo) {
       save_and_next(ls);
     else break;
   }
+  if (lislalnum(ls->current))  /* is numeral touching an alpha num? */
+    save_and_next(ls);  /* force an error */
   save(ls, '\0');
   if (luaO_str2num(luaZ_buffer(ls->buff), &obj) == 0)  /* format error? */
     lexerror(ls, "malformed number", TK_FLT);
diff --git a/testes/literals.lua b/testes/literals.lua
index fc45d4ad..27f9377d 100644
--- a/testes/literals.lua
+++ b/testes/literals.lua
@@ -306,4 +306,13 @@ assert(not load"a = 'non-ending string\n'")
 assert(not load"a = '\\345'")
 assert(not load"a = [=x]")
 
+local function malformednum (n, exp)
+  local s, msg = load("return " .. n)
+  assert(not s and string.find(msg, exp))
+end
+
+malformednum("0xe-", "near <eof>")
+malformednum("0xep-p", "malformed number")
+malformednum("1print()", "malformed number")
+
 print('OK')