From c1bdb560b20d23ebf62d741b07c3ff64c2d4d7c9 Mon Sep 17 00:00:00 2001 From: o9000 Date: Sun, 15 Aug 2010 02:24:13 +0000 Subject: [PATCH] launcher: Prevent calling strlen on NULL git-svn-id: http://tint2.googlecode.com/svn/trunk@540 121b4492-b84c-0410-8b4c-0d4edfb3f3cc --- src/launcher/launcher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/launcher/launcher.c b/src/launcher/launcher.c index 6418a4c..c90c545 100644 --- a/src/launcher/launcher.c +++ b/src/launcher/launcher.c @@ -372,7 +372,7 @@ void expand_exec(DesktopEntry *entry, const char *path) // %c -> Name // %k -> path if (entry->exec) { - char *exec2 = malloc(strlen(entry->exec) + strlen(entry->name) + strlen(entry->icon) + 100); + char *exec2 = malloc(strlen(entry->exec) + (entry->name ? strlen(entry->name) : 1) + (entry->icon ? strlen(entry->icon) : 1) + 100); char *p, *q; // p will never point to an escaped char for (p = entry->exec, q = exec2; *p; p++, q++) {