From 194d8991d7a5b6cf1822f3a4d7459b12975b4107 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 21 Feb 2009 23:47:08 +0100 Subject: make sure we don't choke on overly long lines in .desktop files --- src/modules/module-augment-properties.c | 2 ++ src/pulsecore/conf-parser.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/module-augment-properties.c b/src/modules/module-augment-properties.c index 90bfbe7d..99111868 100644 --- a/src/modules/module-augment-properties.c +++ b/src/modules/module-augment-properties.c @@ -195,6 +195,8 @@ static pa_hook_result_t process(struct userdata *u, pa_proplist *p) { time(&now); + pa_log_debug("Looking for .desktop file for %s", pn); + if ((r = pa_hashmap_get(u->cache, pn))) { if (now-r->timestamp > STAT_INTERVAL) { r->timestamp = now; diff --git a/src/pulsecore/conf-parser.c b/src/pulsecore/conf-parser.c index b7ec2b3c..1d98f36c 100644 --- a/src/pulsecore/conf-parser.c +++ b/src/pulsecore/conf-parser.c @@ -127,7 +127,7 @@ static int parse_line(const char *filename, unsigned line, char **section, const int pa_config_parse(const char *filename, FILE *f, const pa_config_item *t, void *userdata) { int r = -1; unsigned line = 0; - int do_close = !f; + pa_bool_t do_close = !f; char *section = NULL; pa_assert(filename); @@ -144,7 +144,7 @@ int pa_config_parse(const char *filename, FILE *f, const pa_config_item *t, void } while (!feof(f)) { - char l[256]; + char l[4096]; if (!fgets(l, sizeof(l), f)) { if (feof(f)) -- cgit