tinygo-org/tinygo
1
0
Fork 0
mirror of https://github.com/tinygo-org/tinygo.git synced 2026-08-18 11:33:59 +00:00
Code Issues Packages Projects Releases 6 Wiki Activity

interp: check whether the map update key/value are constant

Browse Source 
This is a limitation in the PutString/PutBinary calls, make sure that
they won't get non-constant values as a safety measure.
This commit is contained in:
Ayke van Laethem
2019-12-19 14:18:31 +01:00
committed by Ron Evans
parent 9aeb8d9e06
commit 2004555fe2
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interp/frame.go
+8 -8
View File
@@ -278,24 +278,24 @@ func (fr *frame) evalBasicBlock(bb, incoming llvm.BasicBlock, indent string) (re
} }
case callee.Name() == "runtime.hashmapStringSet": case callee.Name() == "runtime.hashmapStringSet":
// set a string key in the map // set a string key in the map
keyBuf := fr.getLocal(inst.Operand(1)).(*LocalValue)
keyLen := fr.getLocal(inst.Operand(2)).(*LocalValue)
valPtr := fr.getLocal(inst.Operand(3)).(*LocalValue)
m, ok := fr.getLocal(inst.Operand(0)).(*MapValue) m, ok := fr.getLocal(inst.Operand(0)).(*MapValue)
if !ok { if !ok || !keyBuf.IsConstant() || !keyLen.IsConstant() || !valPtr.IsConstant() {
return nil, nil, fr.errorAt(inst, "could not update map with string key") return nil, nil, fr.errorAt(inst, "could not update map with string key")
} }
// "key" is a Go string value, which in the TinyGo calling convention is split up // "key" is a Go string value, which in the TinyGo calling convention is split up
// into separate pointer and length parameters. // into separate pointer and length parameters.
keyBuf := fr.getLocal(inst.Operand(1)).(*LocalValue)
keyLen := fr.getLocal(inst.Operand(2)).(*LocalValue)
valPtr := fr.getLocal(inst.Operand(3)).(*LocalValue)
m.PutString(keyBuf, keyLen, valPtr) m.PutString(keyBuf, keyLen, valPtr)
case callee.Name() == "runtime.hashmapBinarySet": case callee.Name() == "runtime.hashmapBinarySet":
// set a binary (int etc.) key in the map // set a binary (int etc.) key in the map
m, ok := fr.getLocal(inst.Operand(0)).(*MapValue)
if !ok {
return nil, nil, fr.errorAt(inst, "could not update map")
}
keyBuf := fr.getLocal(inst.Operand(1)).(*LocalValue) keyBuf := fr.getLocal(inst.Operand(1)).(*LocalValue)
valPtr := fr.getLocal(inst.Operand(2)).(*LocalValue) valPtr := fr.getLocal(inst.Operand(2)).(*LocalValue)
m, ok := fr.getLocal(inst.Operand(0)).(*MapValue)
if !ok || !keyBuf.IsConstant() || !valPtr.IsConstant() {
return nil, nil, fr.errorAt(inst, "could not update map")
}
m.PutBinary(keyBuf, valPtr) m.PutBinary(keyBuf, valPtr)
case callee.Name() == "runtime.stringConcat": case callee.Name() == "runtime.stringConcat":
// adding two strings together // adding two strings together