Merge pull request syslog-ng#5035 from HofiOne/Further-null-ptr-fixes

Further null ptr fixes

Author: HofiOne

lib/cfg-block.c

@@ -67,13 +67,11 @@ static void
 _validate_args_callback(gpointer k, gpointer v, gpointer user_data)
 {
   CfgArgs *defs = ((gpointer *) user_data)[0];
+  const gchar *reference = ((gpointer *) user_data)[1];
+  gboolean *problem_found = ((gpointer *) user_data)[2];
 
-  if (defs == NULL)
-    return;
-
-  if (FALSE == cfg_args_contains(defs, k))
+  if ((!defs || !cfg_args_contains(defs, k)))
     {
-      const gchar *reference = ((gpointer *) user_data)[1];
       if (cfg_args_is_accepting_varargs(defs))
         {
           msg_verbose("Unknown argument, adding it to __VARARGS__",
@@ -87,7 +85,6 @@ _validate_args_callback(gpointer k, gpointer v, gpointer user_data)
                     evt_tag_str("argument", k),
                     evt_tag_str("value", v),
                     evt_tag_str("reference", reference));
-          gboolean *problem_found = ((gpointer *) user_data)[2];
           *problem_found = TRUE;
         }
     }
@@ -141,7 +138,7 @@ _validate_spurious_args(CfgArgs *self, CfgArgs *defs, const gchar *reference)
 static gboolean
 _validate_args(CfgArgs *self, CfgArgs *defs, const gchar *reference)
 {
-  return _validate_mandatory_options(defs, self, reference) && _validate_spurious_args(self, defs, reference);
+  return defs && _validate_mandatory_options(defs, self, reference) && _validate_spurious_args(self, defs, reference);
 }
 
 /*

lib/logreader.c

@@ -420,7 +420,7 @@ log_reader_work_finished(void *s, gpointer arg)
       log_pipe_notify(self->control, notify_code, self);
     }
 
-  if (self->super.super.flags & PIF_INITIALIZED)
+  if ((self->super.super.flags & PIF_INITIALIZED) && self->proto)
     {
       /* reenable polling the source assuming that we're still in
        * business (e.g. the reader hasn't been uninitialized) */

lib/plugin.c

@@ -384,7 +384,7 @@ plugin_load_module(PluginContext *context, const gchar *module_name, CfgArgs *ar
   g_module_make_resident(mod);
   module_info = _get_module_info(mod);
 
-  if (module_info->canonical_name)
+  if (module_info && module_info->canonical_name)
     {
       g_free(module_init_func);
       module_init_func = _format_module_init_name(module_info->canonical_name ? : module_name);

lib/template/repr.c

@@ -63,6 +63,7 @@ _setup_function_call(LogTemplate *template, Plugin *p, LogTemplateElem *e,
 
   g_return_val_if_fail(error == NULL || *error == NULL, FALSE);
   e->func.ops = plugin_construct(p);
+  g_return_val_if_fail(e->func.ops != NULL, FALSE);
   e->func.state = e->func.ops->size_of_state > 0 ? g_malloc0(e->func.ops->size_of_state) : NULL;
 
   /* prepare may modify the argv array: remove and rearrange elements */

modules/affile/affile-dest.c

@@ -312,22 +312,28 @@ affile_dw_queue(LogPipe *s, LogMessage *lm, const LogPathOptions *path_options)
 }
 
 static void
-affile_dw_set_owner(AFFileDestWriter *self, AFFileDestDriver *owner)
+affile_dw_unset_owner(AFFileDestWriter *self)
 {
   if (self->owner)
     log_pipe_unref(&self->owner->super.super.super);
-  self->owner = owner;
-  if (self->owner)
-    log_pipe_ref(&self->owner->super.super.super);
 
-  self->super.expr_node = self->owner ? self->owner->super.super.super.expr_node : NULL;
+  self->owner = NULL;
+}
+
+static void
+affile_dw_set_owner(AFFileDestWriter *self, AFFileDestDriver *owner)
+{
+  GlobalConfig *cfg = log_pipe_get_config(&owner->super.super.super);
+
   if (self->owner)
-    log_pipe_set_options(&self->super, &self->owner->super.super.super.options);
+    log_pipe_unref(&self->owner->super.super.super);
+  log_pipe_ref(&owner->super.super.super);
+  self->owner = owner;
+  self->super.expr_node = owner->super.super.super.expr_node;
 
-  GlobalConfig *cfg = self->owner ? log_pipe_get_config(&self->owner->super.super.super) : NULL;
+  log_pipe_set_options(&self->super, &owner->super.super.super.options);
   log_pipe_set_config(&self->super, cfg);
-
-  if (self->writer && self->owner)
+  if (self->writer)
     {
       StatsClusterKeyBuilder *writer_sck_builder = stats_cluster_key_builder_new();
       stats_cluster_key_builder_add_label(writer_sck_builder, stats_cluster_label("driver", "file"));
@@ -336,7 +342,7 @@ affile_dw_set_owner(AFFileDestWriter *self, AFFileDestDriver *owner)
       log_pipe_set_config((LogPipe *) self->writer, cfg);
       log_writer_set_options(self->writer,
                              &self->super,
-                             &self->owner->writer_options,
+                             &owner->writer_options,
                              self->owner->super.super.id,
                              writer_sck_builder);
     }
@@ -523,7 +529,7 @@ affile_dd_reuse_writer(gpointer key, gpointer value, gpointer user_data)
   affile_dw_set_owner(writer, self);
   if (!log_pipe_init(&writer->super))
     {
-      affile_dw_set_owner(writer, NULL);
+      affile_dw_unset_owner(writer);
       log_pipe_unref(&writer->super);
       g_hash_table_remove(self->writer_hash, key);
     }

news/bugfix-216.md

@@ -0,0 +1,3 @@
+Fixed potential null pointer deref issues
+
+TODO Add Dmitry Levin @nivelus to the NEWS file as a thank you for finding these