isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure we store an octal number (like umask) as a string.

Browse Source 
JSON doesn't (portably) support octal numbers with a leading zero.
This commit is contained in:
Todd C. Miller
2021-06-16 16:19:12 -06:00
parent efaa173fbe
commit b7e81c46b1
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/audit_json/audit_json.c
View File

@@ -216,9 +216,22 @@ add_key_value(struct json_container *json, const char *str)
/* Check for bool or number. */ /* Check for bool or number. */
json_value.type = JSON_NULL; json_value.type = JSON_NULL;
switch (*cp) { switch (cp[0]) {
case '+': case '-': case '0': case '1': case '2': case '3': case '0':
case '4': case '5': case '6': case '7': case '8': case '9': if (cp[1] == '\0') {
/* Only treat a plain "0" as number 0. */
json_value.u.number = 0;
json_value.type = JSON_NUMBER;
}
break;
case '+': case '-':
if (cp[1] == '0') {
/* Encode octal numbers as strings. */
break;
}
FALLTHROUGH;
case '1': case '2': case '3': case '4': case '5':
case '6': case '7': case '8': case '9':
json_value.u.number = sudo_strtonum(cp, INT_MIN, INT_MAX, &errstr); json_value.u.number = sudo_strtonum(cp, INT_MIN, INT_MAX, &errstr);
if (errstr == NULL) if (errstr == NULL)
json_value.type = JSON_NUMBER; json_value.type = JSON_NUMBER;