fix invalid msg crashing socket

This commit is contained in:
kepler155c@gmail.com 2018-11-09 15:07:55 -05:00
parent cb03e56a1f
commit 68ee419d83
4 changed files with 5 additions and 4 deletions

View File

@ -20,6 +20,8 @@ function Config.load(fname, data)
Util.merge(data, contents)
end
return data
end
function Config.loadWithCheck(fname, data)
@ -36,7 +38,7 @@ function Config.loadWithCheck(fname, data)
shell.run('edit ' .. filename)
end
Config.load(fname, data)
return Config.load(fname, data)
end
function Config.update(fname, data)

View File

@ -183,7 +183,7 @@ function Socket.server(port)
local _, _, sport, dport, msg = os.pullEvent('modem_message')
if sport == port and
msg and
msg and type(msg) == 'table' and
msg.dhost == os.getComputerID() and
msg.type == 'OPEN' then

View File

@ -3,7 +3,6 @@ _G.requireInjector(_ENV)
local Ansi = require('ansi')
local Packages = require('packages')
local UI = require('ui')
local Util = require('util')
local colors = _G.colors
local shell = _ENV.shell
@ -75,7 +74,7 @@ end
function page:run(operation, name)
local oterm = term.redirect(self.action.output.win)
self.action.output:clear()
local cmd = string.format('Package %s %s', operation, name)
local cmd = string.format('package %s %s', operation, name)
--for _ = 1, 3 do
-- print(cmd .. '\n')
-- os.sleep(1)