mirror of
https://github.com/yunionio/cloudpods.git
synced 2026-09-24 16:03:43 +08:00
Automatic merge from release/2.3.0 -> release/2.4.0
* commit '781357045b3e0d1c480e16d32d869132ae2e6f12': 避免因vpc未赋值导致Sort时nil指针访问
This commit is contained in:
@@ -266,11 +266,13 @@ func (self *SSecurityGroup) GetRules() ([]secrules.SecurityRule, error) {
|
||||
originRules := []SecurityGroupPolicy{}
|
||||
originRules = append(originRules, secgroup.SecurityGroupPolicySet.Egress...)
|
||||
originRules = append(originRules, secgroup.SecurityGroupPolicySet.Ingress...)
|
||||
for i := 0; i < len(originRules); i++ {
|
||||
originRules[i].vpc = self.vpc
|
||||
}
|
||||
sort.Sort(SecurityGroupRuleSet(originRules))
|
||||
rules := []secrules.SecurityRule{}
|
||||
priority := 100
|
||||
for _, rule := range originRules {
|
||||
rule.vpc = self.vpc
|
||||
subRules := rule.toRules()
|
||||
for i := 0; i < len(subRules); i++ {
|
||||
subRules[i].Priority = priority
|
||||
|
||||
Reference in New Issue
Block a user