Преглед на файлове

Merge pull request #69 from fedepaol/check_version_fail

Check and return an error when iptables version parsing fails
Casey Callendrello преди 5 години
родител
ревизия
af017ce15c
променени са 1 файла, в които са добавени 6 реда и са изтрити 0 реда
  1. 6 0
      iptables/iptables.go

+ 6 - 0
iptables/iptables.go

@@ -101,7 +101,13 @@ func NewWithProtocol(proto Protocol) (*IPTables, error) {
 		return nil, err
 		return nil, err
 	}
 	}
 	vstring, err := getIptablesVersionString(path)
 	vstring, err := getIptablesVersionString(path)
+	if err != nil {
+		return nil, fmt.Errorf("could not get iptables version: %v", err)
+	}
 	v1, v2, v3, mode, err := extractIptablesVersion(vstring)
 	v1, v2, v3, mode, err := extractIptablesVersion(vstring)
+	if err != nil {
+		return nil, fmt.Errorf("failed to extract iptables version from [%s]: %v", vstring, err)
+	}
 
 
 	checkPresent, waitPresent, randomFullyPresent := getIptablesCommandSupport(v1, v2, v3)
 	checkPresent, waitPresent, randomFullyPresent := getIptablesCommandSupport(v1, v2, v3)