Fix 'nvidia with ncurses segfaults' (sf.net #3006233)

[monky] / src / conky.c

diff --git a/src/conky.c b/src/conky.c
index d1f1c89..3144172 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -166,9 +166,7 @@ int top_cpu, top_mem, top_time;
 #ifdef IOSTATS
 int top_io;
 #endif
-#ifdef __linux__
 int top_running;
-#endif
 int output_methods;
 static int extra_newline;
 enum x_initialiser_state x_initialised = NO;
@@ -509,6 +507,7 @@ static inline void for_each_line(char *b, int f(char *, int))
        char *ps, *pe;
        int special_index = 0; /* specials index */
 
+       if(! b) return;
        for (ps = b, pe = b; *pe; pe++) {
                if (*pe == '\n') {
                        *pe = '\0';
@@ -762,6 +761,8 @@ void generate_text_internal(char *p, int p_max_size,
        buff_in[0] = 0;
 #endif /* HAVE_ICONV */
 
+       if(! p) return;
+
        p[0] = 0;
        obj = root.next;
        while (obj && p_max_size > 0) {
@@ -2179,7 +2180,6 @@ void generate_text_internal(char *p, int p_max_size,
                        /* we have four different types of top (top, top_mem,
                         * top_time and top_io). To avoid having almost-same code four
                         * times, we have this special handler. */
-#ifdef __linux__
                        break;
                        case OBJ_top:
                        case OBJ_top_mem:
@@ -2188,7 +2188,6 @@ void generate_text_internal(char *p, int p_max_size,
                        case OBJ_top_io:
 #endif
                                print_top(obj, p, p_max_size);
-#endif /* __linux__ */
                        OBJ(tail) {
                                print_tailhead("tail", obj, p, p_max_size);
                        }
@@ -2301,7 +2300,7 @@ void generate_text_internal(char *p, int p_max_size,
                        }
 #ifdef NVIDIA
                        OBJ(nvidia) {
-                               print_nvidia_value(obj, display, p, p_max_size);
+                               print_nvidia_value(obj, p, p_max_size);
                        }
 #endif /* NVIDIA */
 #ifdef APCUPSD
@@ -2381,9 +2380,10 @@ void generate_text_internal(char *p, int p_max_size,
 #ifdef HAVE_ICONV
                        iconv_convert(&a, buff_in, p, p_max_size);
 #endif /* HAVE_ICONV */
-                       if (obj->type != OBJ_text && obj->type != OBJ_execp && obj->type != OBJ_execpi
+                       if (obj->type == OBJ_execp || obj->type == OBJ_execpi || obj->type
+                                       == OBJ_exec
 #ifdef HAVE_LUA
-                                       && obj->type != OBJ_lua && obj->type != OBJ_lua_parse
+                                       || obj->type == OBJ_lua || obj->type == OBJ_lua_parse
 #endif /* HAVE_LUA */
                                        ) {
                                substitute_newlines(p, a - 2);
@@ -3993,11 +3993,40 @@ static void reload_config(void)
        initialisation(argc_copy, argv_copy);
 }
 
-void clean_up(void *memtofree1, void* memtofree2)
+#ifdef X11
+void clean_up_x11(void)
 {
-       int i;
+       if(window_created == 1) {
+               XClearArea(display, window.window, text_start_x - window.border_inner_margin - window.border_outer_margin - window.border_width,
+                       text_start_y - window.border_inner_margin - window.border_outer_margin - window.border_width,
+                       text_width + window.border_inner_margin * 2 + window.border_outer_margin * 2 + window.border_width * 2,
+                       text_height + window.border_inner_margin * 2 + window.border_outer_margin * 2 + window.border_width * 2, 0);
+       }
+       destroy_window();
+       free_fonts();
+       fonts = NULL;
+       if(x11_stuff.region) {
+               XDestroyRegion(x11_stuff.region);
+               x11_stuff.region = NULL;
+       }
+       if(display) {
+               XCloseDisplay(display);
+               display = NULL;
+       }
+       if(info.x11.desktop.all_names) {
+               free(info.x11.desktop.all_names);
+               info.x11.desktop.all_names = NULL;
+       }
+       if (info.x11.desktop.name) {
+               free(info.x11.desktop.name);
+               info.x11.desktop.name = NULL;
+       }
+       x_initialised = NO;
+}
+#endif
 
-       free_update_callbacks();
+void clean_up_without_threads(void *memtofree1, void* memtofree2) {
+       int i;
 
 #ifdef NCURSES
        if(output_methods & TO_NCURSES) {
@@ -4020,34 +4049,15 @@ void clean_up(void *memtofree1, void* memtofree2)
        }
 #ifdef X11
        if (x_initialised == YES) {
-               if(window_created == 1) {
-                       XClearArea(display, window.window, text_start_x - window.border_inner_margin - window.border_outer_margin - window.border_width,
-                               text_start_y - window.border_inner_margin - window.border_outer_margin - window.border_width,
-                               text_width + window.border_inner_margin * 2 + window.border_outer_margin * 2 + window.border_width * 2,
-                               text_height + window.border_inner_margin * 2 + window.border_outer_margin * 2 + window.border_width * 2, 0);
-               }
-               destroy_window();
-               free_fonts();
-               if(x11_stuff.region) {
-                       XDestroyRegion(x11_stuff.region);
-                       x11_stuff.region = NULL;
-               }
-               XCloseDisplay(display);
-               display = NULL;
-               if(info.x11.desktop.all_names) {
-                       free(info.x11.desktop.all_names);
-                       info.x11.desktop.all_names = NULL;
-               }
-               if (info.x11.desktop.name) {
-                       free(info.x11.desktop.name);
-                       info.x11.desktop.name = NULL;
-               }
-               x_initialised = NO;
+               clean_up_x11();
        }else{
                free(fonts);    //in set_default_configurations a font is set but not loaded
                font_count = -1;
        }
 
+#ifdef NVIDIA
+       set_nvidia_display(NULL);
+#endif
 #endif /* X11 */
 
        free_templates();
@@ -4116,6 +4126,12 @@ void clean_up(void *memtofree1, void* memtofree2)
        }
 }
 
+void clean_up(void *memtofree1, void* memtofree2)
+{
+       free_update_callbacks();
+       clean_up_without_threads(memtofree1, memtofree2);
+}
+
 static int string_to_bool(const char *s)
 {
        if (!s) {
@@ -4219,9 +4235,7 @@ static void set_default_configurations(void)
 #ifdef IOSTATS
        top_io = 0;
 #endif
-#ifdef __linux__
        top_running = 0;
-#endif
 #ifdef MPD
        mpd_env_host = getenv("MPD_HOST");
        mpd_env_port = getenv("MPD_PORT");
@@ -4574,15 +4588,12 @@ char load_config_file(const char *f)
 
 #ifdef X11
                CONF2("out_to_x") {
-                       /* don't listen if X is already initialised or
-                        * if we already know we don't want it */
-                       if(x_initialised != YES) {
-                               if (string_to_bool(value)) {
-                                       output_methods &= TO_X;
-                               } else {
-                                       output_methods &= ~TO_X;
-                                       x_initialised = NEVER;
-                               }
+                       if (string_to_bool(value)) {
+                               output_methods &= TO_X;
+                       } else {
+                               clean_up_x11();
+                               output_methods &= ~TO_X;
+                               x_initialised = NEVER;
                        }
                }
                CONF("display") {
@@ -4594,6 +4605,12 @@ char load_config_file(const char *f)
                                disp = strdup(value);
                        }
                }
+#ifdef NVIDIA
+               CONF("nvidia_display") {
+                       if(value)
+                               set_nvidia_display(value);
+               }
+#endif
                CONF("alignment") {
                        setalignment(&text_alignment, window.type, value, f, line, 1);
                }