Skip to content

Commit efd9da9

Browse files
Merge pull request #3 from IntelLabs/io_read
changed IO.read* -> File.read* to avoid code injection attack
2 parents ecbe599 + 8c78e82 commit efd9da9

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

async-toolkit/m3utils/mby-merged/tools/srdl/scripts/htm_table.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class HtmTable < RDL::ViewGen
1212

1313
class SecurityInfo
1414
def initialize(security_pm)
15-
sec_hash = IO.read(security_pm).scan(/%security.*^\t\);/m).shift.
15+
sec_hash = File.read(security_pm).scan(/%security.*^\t\);/m).shift.
1616
sub(/^%/,"").
1717
sub(/\(/,"{").
1818
sub(/\)/,"}")

async-toolkit/m3utils/mby-merged/tools/srdl/scripts/rdl.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ def initialize(rdl_file)
214214
registers = Array.new
215215
regfiles = Array.new
216216
addrmaps = Array.new
217-
rdl = rdl_file.class == String && rdl_file || IO.read(rdl_file)
217+
rdl = rdl_file.class == String && rdl_file || File.read(rdl_file)
218218
rdl.gsub!(/\/\/.*/,"")
219219
rdl.gsub!(/^\s*lsm_IMN_map\s+\w+.*/,"") # FIXME
220220
rdl.scan(/^enum\s+(\w+)\s*(\{.*?^\};)/m ) do |tn,bdy|
@@ -264,7 +264,7 @@ def initialize(rdl_file)
264264
def read_include_all(rdl_file, readit)
265265
return [] if rdl_file =~ /lsm_cfg.rdl/ # FIXME
266266
return [] if !File.exist?(rdl_file)
267-
IO.readlines(rdl_file).map do |ln|
267+
File.readlines(rdl_file).map do |ln|
268268
if ln =~ /^\s*`include\s+\"(.*?)\"/
269269
readit[$1] ? [] : read_include_all($1, readit[$1] = true && readit)
270270
else
@@ -291,7 +291,7 @@ def create(output_file, template)
291291
# Read output_file into @view_code Array
292292
def source(output_file, template="")
293293
if File.exist? output_file
294-
@view_code = IO.readlines(output_file)
294+
@view_code = File.readlines(output_file)
295295
else
296296
if File.exist?("#{File.dirname(__FILE__)}/#{template}.template")
297297
create(output_file, template)

async-toolkit/m3utils/mby-merged/tools/srdl/scripts/rdl_mgm_map.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class RdlMgmMap < RDL::ViewGen
2222
class Logical < Hash
2323
require "yaml"
2424
def initialize(logical_file)
25-
logical_str = IO.read(logical_file).split(/\n/).map do |ln|
25+
logical_str = File.read(logical_file).split(/\n/).map do |ln|
2626
ln.strip.empty? ? nil : ln.sub(/=/,":").split
2727
end.compact
2828
logical_str.map!{|ln|ln[0..-3].join('-')+' '+ln[-2..-1].join(' ')}

0 commit comments

Comments
 (0)