fix potential empty eni

l1b0k · l1b0k · commit fb5aac8d8eda · 2022-03-17T22:23:49.000+08:00
diff --git a/daemon/eni-multi-ip.go b/daemon/eni-multi-ip.go
@@ -175,7 +175,7 @@ func (f *eniIPFactory) getEnis(ctx *AllocCtx) ([]*ENI, error) {
 	eniIPLog.Infof("adjusted vswitch slice: %+v, original eni slice: %s", vSwitches, func(enis []*ENI) string {
 		var vsw []string
 		for i := 0; i < len(enis); i++ {
-			if enis[i] == nil {
+			if enis[i] == nil || enis[i].ENI == nil {
 				continue
 			}
 			vsw = append(vsw, enis[i].VSwitchID)

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ func (f eniIPFactory) getEnis(ctx AllocCtx) ([]*ENI, error) {`
`175`	`175`	`eniIPLog.Infof("adjusted vswitch slice: %+v, original eni slice: %s", vSwitches, func(enis []*ENI) string {`
`176`	`176`	`var vsw []string`
`177`	`177`	`for i := 0; i < len(enis); i++ {`
`178`		`- if enis[i] == nil {`
	`178`	`+ if enis[i] == nil \|\| enis[i].ENI == nil {`
`179`	`179`	`continue`
`180`	`180`	`}`
`181`	`181`	`vsw = append(vsw, enis[i].VSwitchID)`