Merge pull request #74 from cjsworld/cjs

1、有人通过namespace白名单来注入，结果lambda对应的匿名类也注入了，它的函数参数名可能为空。 2、白名单注入，有些情况下method.Body为空，但不是抽象方法和pinvoke方法； 3、有的同学有定义了名字为Item的property，这和this[]重载的名字是一样的，需要区分。
Tencent · Jan 13, 2017 · 6e4bda4 · 6e4bda4
2 parents 527f1e4 + 0f0afff
commit 6e4bda4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Assets/XLua/Src/Editor/Hotfix.cs b/Assets/XLua/Src/Editor/Hotfix.cs
@@ -232,7 +232,7 @@ static bool injectType(AssemblyDefinition assembly, TypeReference hotfixAttribut
                 }
                 foreach (var method in type.Methods)
                 {
-                    if (method.Name != ".cctor" && !method.IsAbstract && !method.IsPInvokeImpl)
+                    if (method.Name != ".cctor" && !method.IsAbstract && !method.IsPInvokeImpl && method.Body != null)
                     {
                         if ((method.HasGenericParameters || genericInOut(assembly, method)) ? !injectGenericMethod(assembly, method, hotfixType, stateTable) :
                             !injectMethod(assembly, method, hotfixType, stateTable))

diff --git a/Assets/XLua/Src/Editor/Template/LuaDelegateBridge.tpl.txt b/Assets/XLua/Src/Editor/Template/LuaDelegateBridge.tpl.txt
@@ -29,6 +29,8 @@ namespace XLua
 		if has_return then out_num = out_num + 1 end
 		%>
 		public <%=return_type_name%> <%=CSVariableName(delegate.ReturnType)%>(<%ForEachCsList(parameters, function(parameter, pi) 
+			local pname = parameter.Name
+			if pname == '' or pname == 'object' then pname = 'p' .. tostring(pi) end
 			if pi ~= 0 then 
 				%>, <% 
 			end
@@ -37,7 +39,7 @@ namespace XLua
 			elseif parameter.ParameterType.IsByRef then
 				%>ref <%
 			end 
-			%><%=CsFullTypeName(parameter.ParameterType)%> <%=parameter.Name%><% 
+			%><%=CsFullTypeName(parameter.ParameterType)%> <%=pname%><% 
 		end) %>)
 		{
 #if THREAD_SAFT || HOTFIX_ENABLE
@@ -54,8 +56,10 @@ namespace XLua
                 local param_count = parameters.Length
                 local has_v_params = param_count > 0 and parameters[param_count - 1].IsParamArray
                 ForEachCsList(parameters, function(parameter, pi) 
+					local pname = parameter.Name
+					if pname == '' or pname == 'object' then pname = 'p' .. tostring(pi) end
                     if parameter.IsIn or not parameter.IsOut then 
-                        %><%=GetPushStatement(parameter.ParameterType, parameter.Name, has_v_params and pi == param_count - 1)%>;
+                        %><%=GetPushStatement(parameter.ParameterType, pname, has_v_params and pi == param_count - 1)%>;
                 <% 
                     end
                 end) %>

diff --git a/Assets/XLua/Src/Utils.cs b/Assets/XLua/Src/Utils.cs
@@ -473,7 +473,7 @@ static void makeReflectionWrap(RealStatePtr L, Type type, int cls_field, int cls
             for (int i = 0; i < props.Length; ++i)
             {
                 PropertyInfo prop = props[i];
-                if (prop.Name == "Item")
+                if (prop.Name == "Item" && prop.GetIndexParameters().Length > 0)
                 {
                     items.Add(prop);
                 }