Safer operation on variant string

Signed-off-by: Chongyi Zheng <git@zcy.dev>
containerd · Jun 27, 2024 · a924c4b · a924c4b
1 parent 0cdbb8b
commit a924c4b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/compare.go b/compare.go
@@ -73,10 +73,11 @@ func platformVector(platform specs.Platform) []specs.Platform {
 			variant = "v8"
 		}
 
-		if armMajor, err := strconv.Atoi(strings.TrimPrefix(variant[:2], "v")); err == nil && armMajor >= 8 {
+		majorVariant, minorVariant, hasMinor := strings.Cut(variant, ".") // v8.0 -> v8
+		if armMajor, err := strconv.Atoi(strings.TrimPrefix(majorVariant, "v")); err == nil && armMajor >= 8 {
 			armMinor := 0
 			if len(variant) == 4 {
-				if minor, err := strconv.Atoi(variant[3:]); err == nil && variant[2] == '.' {
+				if minor, err := strconv.Atoi(minorVariant); err == nil && hasMinor {
 					armMinor = minor
 				}
 			}