From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 21 Feb 2017 18:12:32 +0000 (+0100)
Subject: settings: Add support for hex integers (0x prefix) via get_int()
X-Git-Tag: 5.5.2dr6~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b5cbb3db1582fd14d09e55d344e78aa0c6344a0;p=thirdparty%2Fstrongswan.git

settings: Add support for hex integers (0x prefix) via get_int()
---

diff --git a/src/libstrongswan/settings/settings.c b/src/libstrongswan/settings/settings.c
index 829e784820..b00e8190ca 100644
--- a/src/libstrongswan/settings/settings.c
+++ b/src/libstrongswan/settings/settings.c
@@ -512,11 +512,16 @@ inline int settings_value_as_int(char *value, int def)
 {
 	int intval;
 	char *end;
+	int base = 10;
 
 	if (value)
 	{
 		errno = 0;
-		intval = strtol(value, &end, 10);
+		if (value[0] == '0' && value[1] == 'x')
+		{	/* manually detect 0x prefix as we want to avoid octal encoding */
+			base = 16;
+		}
+		intval = strtol(value, &end, base);
 		if (errno == 0 && *end == 0 && end != value)
 		{
 			return intval;