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

If sudo_debug_register() fails return SUDO_DEBUG_INSTANCE_INITIALIZER,

Browse Source 
not -1.  Otherwise we could end up setting the instance to -1 which
is invalid.
This commit is contained in:
Todd C. Miller
2015-01-21 10:08:41 -07:00
parent 721cab85e7
commit 2188c83a20
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/util/sudo_debug.c
View File

@@ -222,7 +222,8 @@ sudo_debug_new_output(struct sudo_debug_instance *instance,
* parses settings string from sudo.conf and opens debugfile. * parses settings string from sudo.conf and opens debugfile.
* If subsystem names are specified they override the default values. * If subsystem names are specified they override the default values.
* NOTE: subsystems must not be freed by caller unless deregistered. * NOTE: subsystems must not be freed by caller unless deregistered.
* Returns instance index on success or -1 if cannot open debugfile. * Returns instance index on success or SUDO_DEBUG_INSTANCE_INITIALIZER
* on failure.
*/ */
int int
sudo_debug_register_v1(const char *program, const char *const subsystems[], sudo_debug_register_v1(const char *program, const char *const subsystems[],
@@ -234,14 +235,14 @@ sudo_debug_register_v1(const char *program, const char *const subsystems[],
int idx, free_idx = -1; int idx, free_idx = -1;
if (debug_files == NULL) if (debug_files == NULL)
return -1; return SUDO_DEBUG_INSTANCE_INITIALIZER;
/* Use default subsystem names if none are provided. */ /* Use default subsystem names if none are provided. */
if (subsystems == NULL) { if (subsystems == NULL) {
subsystems = sudo_debug_default_subsystems; subsystems = sudo_debug_default_subsystems;
} else if (ids == NULL) { } else if (ids == NULL) {
/* If subsystems are specified we must have ids[] too. */ /* If subsystems are specified we must have ids[] too. */
return -1; return SUDO_DEBUG_INSTANCE_INITIALIZER;
} }
/* Search for existing instance. */ /* Search for existing instance. */
@@ -279,11 +280,11 @@ sudo_debug_register_v1(const char *program, const char *const subsystems[],
if (idx == SUDO_DEBUG_INSTANCE_MAX) { if (idx == SUDO_DEBUG_INSTANCE_MAX) {
/* XXX - realloc? */ /* XXX - realloc? */
sudo_warnx_nodebug("too many debug instances (max %d)", SUDO_DEBUG_INSTANCE_MAX); sudo_warnx_nodebug("too many debug instances (max %d)", SUDO_DEBUG_INSTANCE_MAX);
return -1; return SUDO_DEBUG_INSTANCE_INITIALIZER;
} }
if (idx != sudo_debug_last_instance + 1 && idx != free_idx) { if (idx != sudo_debug_last_instance + 1 && idx != free_idx) {
sudo_warnx_nodebug("%s: instance number mismatch: expected %d or %d, got %d", __func__, sudo_debug_last_instance + 1, free_idx, idx); sudo_warnx_nodebug("%s: instance number mismatch: expected %d or %d, got %d", __func__, sudo_debug_last_instance + 1, free_idx, idx);
return -1; return SUDO_DEBUG_INSTANCE_INITIALIZER;
} }
instance = sudo_emalloc(sizeof(*instance)); instance = sudo_emalloc(sizeof(*instance));
instance->program = sudo_estrdup(program); instance->program = sudo_estrdup(program);
@@ -800,7 +801,7 @@ sudo_debug_get_default_instance_v1(void)
/* /*
* Sets a new default instance, returning the old one. * Sets a new default instance, returning the old one.
* Note that the old instance may be SUDO_DEBUG_INSTANCE_INITIALIZER * Note that the old instance may be SUDO_DEBUG_INSTANCE_INITIALIZER
* of this is the only instance. * if this is the only instance.
*/ */
int int
sudo_debug_set_default_instance_v1(int inst) sudo_debug_set_default_instance_v1(int inst)