Fix #824: Workaround potential null pointer dereferences

2 files changed, 3 insertions, 3 deletions

diff --git a/compat/hashtab.c b/compat/hashtab.c
index c4d6361a..3f3171c5 100644
--- a/compat/hashtab.c
+++ b/compat/hashtab.c
@@ -728,7 +728,7 @@ htab_remove_elt_with_hash (htab_t htab, PTR element, hashval_t hash)
   PTR *slot;
 
   slot = htab_find_slot_with_hash (htab, element, hash, NO_INSERT);
-  if (*slot == HTAB_EMPTY_ENTRY)
+  if (!slot || *slot == HTAB_EMPTY_ENTRY)
     return;
 
   if (htab->del_f)
diff --git a/src/line.c b/src/line.c
index b78457b6..fd0f5294 100644
--- a/src/line.c
+++ b/src/line.c
@@ -206,8 +206,8 @@ init_colors(void)
 {
 	struct line_rule query = { "default", STRING_SIZE("default") };
 	struct line_rule *rule = find_line_rule(&query);
-	int default_bg = rule->info.bg;
-	int default_fg = rule->info.fg;
+	int default_bg = rule ? rule->info.bg : COLOR_BLACK;
+	int default_fg = rule ? rule->info.fg : COLOR_WHITE;
 	enum line_type type;
 
 	/* XXX: Even if the terminal does not support colors (e.g.