Merge pull request #466 from stilez/master

Fix issue in version_compare that can cause versions to be wrongly marked incompatible

1 files changed, 8 insertions, 2 deletions

diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 7c64d2f..7c53885 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -1933,7 +1933,8 @@ function version_get_string_value($a) {
 		5 => "C",
 		6 => "D",
 		7 => "RC",
-		8 => "RELEASE"
+		8 => "RELEASE",
+		9 => "*"			// Matches all release levels
 	);
 	$major = 0;
 	$minor = 0;
@@ -1949,7 +1950,12 @@ function version_get_string_value($a) {
 	return "{$major}.{$minor}";
 }
 function version_compare_string($a, $b) {
-	return version_compare_numeric(version_get_string_value($a), version_get_string_value($b));
+	// Only compare string parts if both versions give a specific release
+	// (If either version lacks a string part, assume intended to match all release levels)
+	if (isset($a) && isset($b)) 
+        	return version_compare_numeric(version_get_string_value($a), version_get_string_value($b));
+        else
+        	return 0;
 }
 function version_compare_numeric($a, $b) {
 	$a_arr = explode('.', rtrim($a, '.0'));