Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

contrib/lar: get rid of hardcoded buffer size in larlib

Browse source
This commit is contained in:
Jo-Philipp Wich 2009-04-13 15:32:04 +00:00
parent 15798344bf
commit df11154ba3
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/lar/larlib.c
View file

@ -145,7 +145,7 @@ static int larlib_mkpath( const char *name, const char *path, char *buffer )
int nlen = strlen(name); int nlen = strlen(name);
int plen = strlen(path); int plen = strlen(path);
if( (nlen + plen + 1) <= 1024 ) if( (nlen + plen + 1) <= LAR_FNAME_BUFFER )
{ {
strcpy(buffer, path); strcpy(buffer, path);
@ -451,10 +451,10 @@ int larlib_findfile( lua_State *L )
int i; int i;
const char *filename = luaL_checkstring( L, 1 ); const char *filename = luaL_checkstring( L, 1 );
const char *basepath = luaL_optstring( L, 2, "./" ); const char *basepath = luaL_optstring( L, 2, "./" );
char filepath[1024];
struct stat s; struct stat s;
lar_archive *ar; lar_archive *ar;
lar_member *mb; lar_member *mb;
LAR_FNAME(filepath);
const char *searchpath[3] = { basepath, LUA_LDIR, LUA_CDIR }; const char *searchpath[3] = { basepath, LUA_LDIR, LUA_CDIR };

6
contrib/lar/openwrt/050-lar-source-loader.patch
View file

@ -456,7 +456,7 @@ diff -Nbur lua-5.1.4.orig/src/lar.h lua-5.1.4/src/lar.h
+#endif +#endif
diff -Nbur lua-5.1.4.orig/src/larlib.c lua-5.1.4/src/larlib.c diff -Nbur lua-5.1.4.orig/src/larlib.c lua-5.1.4/src/larlib.c
--- lua-5.1.4.orig/src/larlib.c 1970-01-01 01:00:00.000000000 +0100 --- lua-5.1.4.orig/src/larlib.c 1970-01-01 01:00:00.000000000 +0100
+++ lua-5.1.4/src/larlib.c 2009-04-13 16:51:15.000000000 +0200 +++ lua-5.1.4/src/larlib.c 2009-04-13 17:24:57.000000000 +0200
@@ -0,0 +1,540 @@ @@ -0,0 +1,540 @@
+/* +/*
+ * lar - Lua Archive Library + * lar - Lua Archive Library
@ -605,7 +605,7 @@ diff -Nbur lua-5.1.4.orig/src/larlib.c lua-5.1.4/src/larlib.c
+ int nlen = strlen(name); + int nlen = strlen(name);
+ int plen = strlen(path); + int plen = strlen(path);
+ +
+ if( (nlen + plen + 1) <= 1024 ) + if( (nlen + plen + 1) <= LAR_FNAME_BUFFER )
+ { + {
+ strcpy(buffer, path); + strcpy(buffer, path);
+ +
@ -911,10 +911,10 @@ diff -Nbur lua-5.1.4.orig/src/larlib.c lua-5.1.4/src/larlib.c
+ int i; + int i;
+ const char *filename = luaL_checkstring( L, 1 ); + const char *filename = luaL_checkstring( L, 1 );
+ const char *basepath = luaL_optstring( L, 2, "./" ); + const char *basepath = luaL_optstring( L, 2, "./" );
+ char filepath[1024];
+ struct stat s; + struct stat s;
+ lar_archive *ar; + lar_archive *ar;
+ lar_member *mb; + lar_member *mb;
+ LAR_FNAME(filepath);
+ +
+ const char *searchpath[3] = { basepath, LUA_LDIR, LUA_CDIR }; + const char *searchpath[3] = { basepath, LUA_LDIR, LUA_CDIR };
+ +