luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

prevent oob

Browse source
This commit is contained in:
Alexander Wang 2024-08-26 21:27:56 -06:00
parent b6a92688b8
commit e93a60dea1
No known key found for this signature in database
GPG key ID: BE3937D0D52D8927
3 changed files with 129 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
d2compiler/compile_test.go
View file

@ -2386,6 +2386,17 @@ layers: {
tassert.Equal(t, "root.layers.a", g.Layers[2].Layers[0].Objects[2].Link.Value) tassert.Equal(t, "root.layers.a", g.Layers[2].Layers[0].Objects[2].Link.Value)
}, },
}, },
{
name: "link-beyond-import-root",
text: `...@x`,
files: map[string]string{
"x.d2": `x.link: _.layers.z
`,
},
assertions: func(t *testing.T, g *d2graph.Graph) {
tassert.Equal(t, (*d2graph.Scalar)(nil), g.Objects[0].Link)
},
},
{ {
name: "link-board-underscore-not-found", name: "link-board-underscore-not-found",
text: `x text: `x

4
d2ir/compile.go
View file

@ -904,6 +904,7 @@ func (c *compiler) ignoreLazyGlob(n Node) bool {
func (c *compiler) extendLinks(m *Map, importF *Field, importDir string) { func (c *compiler) extendLinks(m *Map, importF *Field, importDir string) {
nodeBoardKind := NodeBoardKind(m) nodeBoardKind := NodeBoardKind(m)
importIDA := IDA(importF) importIDA := IDA(importF)
FIELDS_LOOP:
for _, f := range m.Fields { for _, f := range m.Fields {
if f.Name == "link" { if f.Name == "link" {
if nodeBoardKind != "" { if nodeBoardKind != "" {
@ -922,6 +923,9 @@ func (c *compiler) extendLinks(m *Map, importF *Field, importDir string) {
for _, id := range linkIDA[1:] { for _, id := range linkIDA[1:] {
if id == "_" { if id == "_" {
if len(linkIDA) < 2 || len(importIDA) < 2 {
continue FIELDS_LOOP
}
linkIDA = append([]string{linkIDA[0]}, linkIDA[2:]...) linkIDA = append([]string{linkIDA[0]}, linkIDA[2:]...)
importIDA = importIDA[:len(importIDA)-2] importIDA = importIDA[:len(importIDA)-2]
} else { } else {

114
testdata/d2compiler/TestCompile/link-beyond-import-root.exp.json generated vendored Normal file
View file

@ -0,0 +1,114 @@
{
"graph": {
"name": "",
"isFolderOnly": false,
"ast": {
"range": "d2/testdata/d2compiler/TestCompile/link-beyond-import-root.d2,0:0:0-0:5:5",
"nodes": [
{
"import": {
"range": "d2/testdata/d2compiler/TestCompile/link-beyond-import-root.d2,0:0:0-0:5:5",
"spread": true,
"pre": "",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/link-beyond-import-root.d2,0:4:4-0:5:5",
"value": [
{
"string": "x",
"raw_string": "x"
}
]
}
}
]
}
}
]
},
"root": {
"id": "",
"id_val": "",
"attributes": {
"label": {
"value": ""
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": ""
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
},
"edges": null,
"objects": [
{
"id": "x",
"id_val": "x",
"references": [
{
"key": {
"range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-0:6:6",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-0:1:1",
"value": [
{
"string": "x",
"raw_string": "x"
}
]
}
},
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/x.d2,0:2:2-0:6:6",
"value": [
{
"string": "link",
"raw_string": "link"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": -1
}
],
"attributes": {
"label": {
"value": "x"
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
}
]
},
"err": null
}