On Wed, Sep 25, 2013 at 11:07 AM, Alex DAMIAN <[email protected]> wrote: > From: Alexandru DAMIAN <[email protected]> > > weston_config_parse may return NULL, > leading to an ungraceful exit via SIGSEGV if we > try to reference the structure. > > Adding a check in weston_config_full_path so that > we return the empty file /dev/null as filename > if we started without a config file.
I think it's ok for weston_config_get_full_path() to crash if passed a NULL pointer. Returning /dev/null or anything else is a little odd. Maybe returning NULL would be ok, but I think we can just have an if statement and log "No config file found" if config is NULL, and log the file name if we did get a config. Kristian > Signed-off-by: Alexandru DAMIAN <[email protected]> > --- > shared/config-parser.c | 2 +- > src/compositor.c | 1 + > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/shared/config-parser.c b/shared/config-parser.c > index e1bf212..ef5c5b9 100644 > --- a/shared/config-parser.c > +++ b/shared/config-parser.c > @@ -385,7 +385,7 @@ weston_config_parse(const char *name) > const char * > weston_config_get_full_path(struct weston_config *config) > { > - return config->path; > + return config == NULL ? "/dev/null" : config->path; > } > > int > 1.8.1.2 > > _______________________________________________ > wayland-devel mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/wayland-devel _______________________________________________ wayland-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/wayland-devel
