summaryrefslogtreecommitdiff
path: root/deps/lua/src/liolib.c
diff options
context:
space:
mode:
authorYossi Gottlieb <yossigo@gmail.com>2013-06-23 08:59:01 +0300
committerYossi Gottlieb <yossigo@gmail.com>2013-06-23 08:59:01 +0300
commita9a29ff16effa0d36a16c0859c3dadb4ab87889a (patch)
tree89e376da1560d6fb16b20d1b570d9a53017458be /deps/lua/src/liolib.c
parent9cc3257e94cdbea94ea259f834409a221f121da4 (diff)
parent16ddbb7dfc435f1abb01ecd4df316827be341899 (diff)
downloadredis-2.6.14-1.tar.gz
Merge upstream 2.6.14.2.6.14-1
Diffstat (limited to 'deps/lua/src/liolib.c')
-rw-r--r--deps/lua/src/liolib.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/deps/lua/src/liolib.c b/deps/lua/src/liolib.c
index e79ed1cb2..649f9a595 100644
--- a/deps/lua/src/liolib.c
+++ b/deps/lua/src/liolib.c
@@ -1,5 +1,5 @@
/*
-** $Id: liolib.c,v 2.73.1.3 2008/01/18 17:47:43 roberto Exp $
+** $Id: liolib.c,v 2.73.1.4 2010/05/14 15:33:51 roberto Exp $
** Standard I/O (and system) library
** See Copyright Notice in lua.h
*/
@@ -276,7 +276,10 @@ static int read_number (lua_State *L, FILE *f) {
lua_pushnumber(L, d);
return 1;
}
- else return 0; /* read fails */
+ else {
+ lua_pushnil(L); /* "result" to be removed */
+ return 0; /* read fails */
+ }
}