make sure we don't choke on overly long lines in .desktop files

This commit is contained in:
Lennart Poettering 2009-02-21 23:47:08 +01:00
parent edfa39a2af
commit 194d8991d7
2 changed files with 4 additions and 2 deletions

View file

@ -195,6 +195,8 @@ static pa_hook_result_t process(struct userdata *u, pa_proplist *p) {
time(&now); time(&now);
pa_log_debug("Looking for .desktop file for %s", pn);
if ((r = pa_hashmap_get(u->cache, pn))) { if ((r = pa_hashmap_get(u->cache, pn))) {
if (now-r->timestamp > STAT_INTERVAL) { if (now-r->timestamp > STAT_INTERVAL) {
r->timestamp = now; r->timestamp = now;

View file

@ -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 pa_config_parse(const char *filename, FILE *f, const pa_config_item *t, void *userdata) {
int r = -1; int r = -1;
unsigned line = 0; unsigned line = 0;
int do_close = !f; pa_bool_t do_close = !f;
char *section = NULL; char *section = NULL;
pa_assert(filename); 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)) { while (!feof(f)) {
char l[256]; char l[4096];
if (!fgets(l, sizeof(l), f)) { if (!fgets(l, sizeof(l), f)) {
if (feof(f)) if (feof(f))