Fix crashes from large material path

(cherry picked from commit 88faa3f)
wiremod · Jul 21, 2019 · 9b748c9 · 9b748c9
1 parent 93b4d18
commit 9b748c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/lua/entities/gmod_wire_expression2/core/egpfunctions.lua b/lua/entities/gmod_wire_expression2/core/egpfunctions.lua
@@ -675,6 +675,7 @@ end
 ----------------------------
 e2function void wirelink:egpMaterial( number index, string material )
 	if (!EGP:IsAllowed( self, this )) then return end
+	material = WireLib.IsValidMaterial(material)
 	local bool, k, v = EGP:HasObject( this, index )
 	if (bool) then
 		if (EGP:EditObject( v, { material = material } )) then EGP:DoAction( this, self, "SendObject", v ) Update(self,this) end

diff --git a/lua/wire/server/wirelib.lua b/lua/wire/server/wirelib.lua
@@ -1176,6 +1176,7 @@ local material_blacklist = {
 	["effects/ar2_altfire1"] = true
 }
 function WireLib.IsValidMaterial(material)
+	material = string.sub(material, 1, 260)
 	local path = string.StripExtension(string.GetNormalizedFilepath(string.lower(material)))
 	if material_blacklist[path] then return "" end
 	return material