Skip to content

Commit c78e7eb

Browse files
committed
Check nil on fileText
1 parent ce7970a commit c78e7eb

3 files changed

Lines changed: 17 additions & 7 deletions

File tree

src/Modules/Build.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1547,6 +1547,10 @@ function buildMode:LoadDBFile()
15471547
return true
15481548
end
15491549
local xmlText = file:read("*a")
1550+
if not xmlText then
1551+
self.dbFileName = nil
1552+
return true
1553+
end
15501554
file:close()
15511555
return self:LoadDB(xmlText, self.dbFileName)
15521556
end

src/Modules/BuildList.lua

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,15 @@ function listMode:BuildList()
165165
if fileHnd then
166166
local fileText = fileHnd:read("*a")
167167
fileHnd:close()
168-
fileText = fileText:match("(<Build.->)")
169168
if fileText then
170-
local xml = common.xml.ParseXML(fileText.."</Build>")
171-
if xml and xml[1] then
172-
build.level = tonumber(xml[1].attrib.level)
173-
build.className = xml[1].attrib.className
174-
build.ascendClassName = xml[1].attrib.ascendClassName
169+
fileText = fileText:match("(<Build.->)")
170+
if fileText then
171+
local xml = common.xml.ParseXML(fileText.."</Build>")
172+
if xml and xml[1] then
173+
build.level = tonumber(xml[1].attrib.level)
174+
build.className = xml[1].attrib.className
175+
build.ascendClassName = xml[1].attrib.ascendClassName
176+
end
175177
end
176178
end
177179
end

src/Modules/Common.lua

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,11 @@ function copyFile(srcName, dstName)
626626
if not outFile then
627627
return nil, "Couldn't create '"..dstName.."': "..msg
628628
end
629-
outFile:write(inFile:read("*a"))
629+
local fileText = inFile:read("*a")
630+
if not fileText then
631+
return nil, "Couldn't read '"..srcName.."': "..msg
632+
end
633+
outFile:write(fileText)
630634
inFile:close()
631635
outFile:close()
632636
return true

0 commit comments

Comments
 (0)