Commit 3bbe3895 authored by Franco Fichtner's avatar Franco Fichtner

interfaces: fix validation of hex in PHP 7

PR: https://github.com/opnsense/core/issues/1331
parent 6801b20c
...@@ -691,7 +691,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { ...@@ -691,7 +691,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
} }
break; break;
case "track6": case "track6":
if (!empty($pconfig['track6-prefix-id--hex']) && !is_numeric("0x" . $pconfig['track6-prefix-id--hex'])) { if (!empty($pconfig['track6-prefix-id--hex']) && !ctype_xdigit($pconfig['track6-prefix-id--hex'])) {
$input_errors[] = gettext("You must enter a valid hexadecimal number for the IPv6 prefix ID."); $input_errors[] = gettext("You must enter a valid hexadecimal number for the IPv6 prefix ID.");
} elseif (!empty($pconfig['track6-interface'])) { } elseif (!empty($pconfig['track6-interface'])) {
$ipv6_delegation_length = calculate_ipv6_delegation_length($pconfig['track6-interface']); $ipv6_delegation_length = calculate_ipv6_delegation_length($pconfig['track6-interface']);
...@@ -1116,7 +1116,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { ...@@ -1116,7 +1116,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$new_config['ipaddrv6'] = "track6"; $new_config['ipaddrv6'] = "track6";
$new_config['track6-interface'] = $pconfig['track6-interface']; $new_config['track6-interface'] = $pconfig['track6-interface'];
$new_config['track6-prefix-id'] = 0; $new_config['track6-prefix-id'] = 0;
if (is_numeric("0x" . $pconfig['track6-prefix-id--hex'])) { if (ctype_xdigit($pconfig['track6-prefix-id--hex'])) {
$new_config['track6-prefix-id'] = intval($pconfig['track6-prefix-id--hex'], 16); $new_config['track6-prefix-id'] = intval($pconfig['track6-prefix-id--hex'], 16);
} }
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment