Fix segfault with no update, debug logging. (#551)

* Fix segfault caused by initiliazed deref.

This fixes #117.

* Revert debug logging changes from a9e968956d.

* Replace not with !.

src/fonts.cc

@@ -40,9 +40,7 @@ void font_setting::lua_setter(lua::state &l, bool init) {
   Base::lua_setter(l, init);
 
   if (init && out_to_x.get(*state)) {
-    if (fonts.empty()) {
+    if (fonts.empty()) { fonts.resize(1); }
-      fonts.resize(1);
-    }
     fonts[0].name = do_convert(l, -1).first;
   }
 
@@ -79,19 +77,17 @@ xftalpha_setting xftalpha;
 
 void set_font() {
 #ifdef BUILD_XFT
-  if (use_xft.get(*state)) {
+  if (use_xft.get(*state)) { return; }
-    return;
-  }
 #endif /* BUILD_XFT */
-  if (fonts[selected_font].font != nullptr) {
+  if (fonts.size() > selected_font && fonts[selected_font].font != nullptr &&
+      window.gc != nullptr) {
     XSetFont(display, window.gc, fonts[selected_font].font->fid);
   }
 }
 
 void setup_fonts() {
-  if (not out_to_x.get(*state)) {
+  DBGP("setting up fonts");
-    return;
+  if (!out_to_x.get(*state)) { return; }
-  }
 #ifdef BUILD_XFT
   if (use_xft.get(*state)) {
     if (window.xftdraw != nullptr) {
@@ -106,9 +102,7 @@ void setup_fonts() {
 }
 
 int add_font(const char *data_in) {
-  if (not out_to_x.get(*state)) {
+  if (!out_to_x.get(*state)) { return 0; }
-    return 0;
-  }
   fonts.emplace_back();
   fonts.rbegin()->name = data_in;
 
@@ -116,9 +110,7 @@ int add_font(const char *data_in) {
 }
 
 void free_fonts(bool utf8) {
-  if (not out_to_x.get(*state)) {
+  if (!out_to_x.get(*state)) { return; }
-    return;
-  }
   for (auto &font : fonts) {
 #ifdef BUILD_XFT
     if (use_xft.get(*state)) {
@@ -132,9 +124,7 @@ void free_fonts(bool utf8) {
     } else
 #endif /* BUILD_XFT */
     {
-      if (font.font != nullptr) {
+      if (font.font != nullptr) { XFreeFont(display, font.font); }
-        XFreeFont(display, font.font);
-      }
       if (utf8 && (font.fontset != nullptr)) {
         XFreeFontSet(display, font.fontset);
       }
@@ -151,9 +141,8 @@ void free_fonts(bool utf8) {
 }
 
 void load_fonts(bool utf8) {
-  if (not out_to_x.get(*state)) {
+  DBGP("loading fonts");
-    return;
+  if (!out_to_x.get(*state)) { return; }
-  }
   for (auto &font : fonts) {
 #ifdef BUILD_XFT
     /* load Xft font */
@@ -162,9 +151,7 @@ void load_fonts(bool utf8) {
         font.xftfont = XftFontOpenName(display, screen, font.name.c_str());
       }
 
-      if (font.xftfont != nullptr) {
+      if (font.xftfont != nullptr) { continue; }
-        continue;
-      }
 
       NORM_ERR("can't load Xft font '%s'", font.name.c_str());
       if ((font.xftfont = XftFontOpenName(display, screen, "courier-12")) !=

src/logging.h

@@ -83,7 +83,7 @@ void NORM_ERR(const char *format, Args &&... args) {
 /* critical error */
 template <typename... Args>
 inline void CRIT_ERR(void *memtofree1, void *memtofree2, const char *format,
-  Args &&... args) {
+                     Args &&... args) {
   NORM_ERR(format, args...);
   clean_up(memtofree1, memtofree2);
   exit(EXIT_FAILURE);
@@ -91,7 +91,7 @@ inline void CRIT_ERR(void *memtofree1, void *memtofree2, const char *format,
 
 template <typename... Args>
 inline void THREAD_CRIT_ERR(void *memtofree1, void *memtofree2,
-  const char *format, Args &&... args) {
+                            const char *format, Args &&... args) {
   NORM_ERR(format, args...);
   clean_up_without_threads(memtofree1, memtofree2);
   return;
@@ -106,21 +106,16 @@ class error : public std::runtime_error {
 
 /* debugging output */
 extern int global_debug_level;
-template <typename... Args>
+
-inline void __DBGP(const int level, const char *format, Args &&... args) {
+#define __DBGP(level, ...)                                               \
-  if (global_debug_level > level) {
+  do {                                                                   \
-    fprintf(stderr, "DEBUG(%d) [" __FILE__ ":%d]: ", level, __LINE__);
+    if (global_debug_level > level) {                                    \
-  gettextize_format(format, args...);
+      fprintf(stderr, "DEBUG(%d) [" __FILE__ ":%d]: ", level, __LINE__); \
-    fputs("\n", stderr);
+      gettextize_format(__VA_ARGS__);                                    \
-  }
+      fputs("\n", stderr);                                               \
-}
+    }                                                                    \
-template <typename... Args>
+  } while (0)
-void DBGP(const char *format, Args &&... args) {
+#define DBGP(...) __DBGP(0, __VA_ARGS__)
-    __DBGP(0, format, args...);
+#define DBGP2(...) __DBGP(1, __VA_ARGS__)
-}
-template <typename... Args>
-void DBGP2(const char *format, Args &&... args) {
-    __DBGP(1, format, args...);
-}
 
 #endif /* _LOGGING_H */