xref: /OK3568_Linux_fs/buildroot/package/lua/5.1.5/0012-fix-reader-at-eoz.patch (revision 4882a59341e53eb6f0b4789bf948001014eff981)
1*4882a593SmuzhiyunWhen loading a file, Lua may call the reader function again after it returned end of input.
2*4882a593Smuzhiyun
3*4882a593SmuzhiyunFetch from: http://www.lua.org/bugs.html#5.1.5-2
4*4882a593Smuzhiyun
5*4882a593SmuzhiyunSigned-off-by: Francois Perrad <francois.perrad@gadz.org>
6*4882a593Smuzhiyun
7*4882a593SmuzhiyunIndex: b/src/lzio.c
8*4882a593Smuzhiyun===================================================================
9*4882a593Smuzhiyun--- a/src/lzio.c
10*4882a593Smuzhiyun+++ b/src/lzio.c
11*4882a593Smuzhiyun@@ -22,10 +22,14 @@
12*4882a593Smuzhiyun   size_t size;
13*4882a593Smuzhiyun   lua_State *L = z->L;
14*4882a593Smuzhiyun   const char *buff;
15*4882a593Smuzhiyun+  if (z->eoz) return EOZ;
16*4882a593Smuzhiyun   lua_unlock(L);
17*4882a593Smuzhiyun   buff = z->reader(L, z->data, &size);
18*4882a593Smuzhiyun   lua_lock(L);
19*4882a593Smuzhiyun-  if (buff == NULL || size == 0) return EOZ;
20*4882a593Smuzhiyun+  if (buff == NULL || size == 0) {
21*4882a593Smuzhiyun+    z->eoz = 1;  /* avoid calling reader function next time */
22*4882a593Smuzhiyun+    return EOZ;
23*4882a593Smuzhiyun+  }
24*4882a593Smuzhiyun   z->n = size - 1;
25*4882a593Smuzhiyun   z->p = buff;
26*4882a593Smuzhiyun   return char2int(*(z->p++));
27*4882a593Smuzhiyun@@ -51,6 +55,7 @@
28*4882a593Smuzhiyun   z->data = data;
29*4882a593Smuzhiyun   z->n = 0;
30*4882a593Smuzhiyun   z->p = NULL;
31*4882a593Smuzhiyun+  z->eoz = 0;
32*4882a593Smuzhiyun }
33*4882a593Smuzhiyun
34*4882a593Smuzhiyun
35*4882a593SmuzhiyunIndex: b/src/lzio.h
36*4882a593Smuzhiyun===================================================================
37*4882a593Smuzhiyun--- a/src/lzio.h
38*4882a593Smuzhiyun+++ b/src/lzio.h
39*4882a593Smuzhiyun@@ -59,6 +59,7 @@
40*4882a593Smuzhiyun   lua_Reader reader;
41*4882a593Smuzhiyun   void* data;			/* additional data */
42*4882a593Smuzhiyun   lua_State *L;			/* Lua state (for reader) */
43*4882a593Smuzhiyun+  int eoz;			/* true if reader has no more data */
44*4882a593Smuzhiyun };
45*4882a593Smuzhiyun
46*4882a593Smuzhiyun
47