Уточнение revision 13045.

FarGroup · Mar 19, 2015 · 2b069c2 · 2b069c2
1 parent ae988db
commit 2b069c2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/plugins/luamacro/_globalinfo.lua b/plugins/luamacro/_globalinfo.lua
@@ -1,6 +1,6 @@
 function export.GetGlobalInfo()
   return {
-    Version       = { 1, 0, 0, 494 },
+    Version       = { 1, 0, 0, 495 },
     MinFarVersion = { 3, 0, 0, 4276 },
     Guid          = win.Uuid("4EBBEFC8-2084-4B7F-94C0-692CE136894D"),
     Title         = "LuaMacro",

diff --git a/plugins/luamacro/changelog b/plugins/luamacro/changelog
@@ -1,4 +1,8 @@
-shmuel 18.03.2015 20:34:15 +0200 - build 494
+shmuel 19.03.2015 09:18:45 +0200 - build 495
+
+1. Уточнение 494.
+
+shmuel 18.03.2015 20:34:15 +0200 - build 494
 
 1. LuaFAR (библиотека regex): падение при большом количестве captures (несколько десятков) из-за
    отсутствовавшего вызова lua_checkstack.

diff --git a/plugins/luamacro/luafar/lregex.c b/plugins/luamacro/luafar/lregex.c
@@ -193,9 +193,9 @@ int rx_find_match(lua_State *L, int op_find, int is_function, int is_wide)
 		}
 
 		skip = (op_find || data.Count>1) ? 1 : 0;
-
-		if (!lua_checkstack(L, (int)data.Count - skip))
-			luaL_error(L, "cannot add %d stack slots", (int)data.Count - skip);
+		i = (int)data.Count - skip + 1;
+		if (!lua_checkstack(L, i))
+			luaL_error(L, "cannot add %d stack slots", i);
 
 		for(i=skip; i<data.Count; i++)
 		{

diff --git a/plugins/luamacro/luamacro.rc b/plugins/luamacro/luamacro.rc
@@ -1,6 +1,6 @@
 #include <farversion.hpp>
 
-#define PLUGIN_BUILD 494
+#define PLUGIN_BUILD 495
 #define PLUGIN_DESC "Lua Macros for Far Manager"
 #define PLUGIN_NAME "LuaMacro"
 #define PLUGIN_FILENAME "luamacro.dll"