Bugfix: same text multiple times caused by if-family

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1141 7f574dfc-610e-0410-a909-a81674777703

diff --git a/AUTHORS b/AUTHORS
index 36a2b59..3c0e089 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -63,7 +63,7 @@ David McCabe
   utime
 
 garo <nikolas at garofil dot be>
-  some bugfixes
+  developer
 
 Ram Yalamanchili
   tztime

diff --git a/ChangeLog b/ChangeLog
index 30b15c8..a37e0d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # $Id$
 
+2008-06-07
+       * Fix bug where DEV_NAME can read uninitialised memory
+       * Fix bug where ${if_mounted /}foo$endif prints foo on 1 line for
+       each update instead of just 1 line
+
 2008-06-05
        * Fix bug where conky prints everything twice to STDOUT when
        out_to_console is enabled

diff --git a/src/conky.c b/src/conky.c
index 382c8d7..ed0f108 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -4279,6 +4279,7 @@ static void generate_text_internal(char *p, int p_max_size,
        iconv_converting = 0;
 #endif
 
+       p[0] = 0;
        for (i = 0; i < object_count; i++) {
                struct text_object *obj = &objs[i];