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

Move duplicated code to parse plugin debug flags to libsudo_util.

Browse Source 
There's no need for four copies of sudo_debug_parse_flags().
This commit is contained in:
Todd C. Miller
2020-02-11 15:15:36 -07:00
parent 9e2e79b6fa
commit 0e4c3c47d1
7 changed files with 48 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
plugins/python/sudo_python_debug.c
View File

@@ -63,40 +63,11 @@ bool
python_debug_parse_flags(struct sudo_conf_debug_file_list *debug_files,
const char *entry)
{
struct sudo_debug_file *debug_file;
const char *filename, *flags;
size_t namelen;
/* Already initialized? */
if (python_debug_instance != SUDO_DEBUG_INSTANCE_INITIALIZER)
return true;
/* Only process new-style debug flags: filename flags,... */
filename = entry;
if (*filename != '/' || (flags = strpbrk(filename, " \t")) == NULL)
return true;
namelen = (size_t)(flags - filename);
while (isblank((unsigned char)*flags))
flags++;
if (*flags != '\0') {
if ((debug_file = calloc(1, sizeof(*debug_file))) == NULL)
goto oom;
if ((debug_file->debug_file = strndup(filename, namelen)) == NULL)
goto oom;
if ((debug_file->debug_flags = strdup(flags)) == NULL)
goto oom;
TAILQ_INSERT_TAIL(debug_files, debug_file, entries);
}
return true;
oom:
if (debug_file != NULL) {
free(debug_file->debug_file);
free(debug_file->debug_flags);
free(debug_file);
}
sudo_warnx_nodebug(U_("%s: %s"), "python_debug_parse_flags",
U_("unable to allocate memory"));
return false;
return sudo_debug_parse_flags(debug_files, entry) != -1;
}
/*