diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-07 12:14:49 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-07 12:14:49 +0200 |
| commit | 833f4642621699890d05c041d3ace5de24f369ba (patch) | |
| tree | e25ae4913d30187cae510e486cc3ebfa0de35a37 /syslogd.c | |
| parent | 65f24e82a0a6777136fe894cd236b41e05e72765 (diff) | |
| download | rsyslog-833f4642621699890d05c041d3ace5de24f369ba.tar.gz rsyslog-833f4642621699890d05c041d3ace5de24f369ba.tar.xz rsyslog-833f4642621699890d05c041d3ace5de24f369ba.zip | |
fixed segfault when using expression based-filters
This was introduced by an invalid CVS patch.
Diffstat (limited to 'syslogd.c')
| -rw-r--r-- | syslogd.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1056,6 +1056,7 @@ finalize_it: if(pVM != NULL) vm.Destruct(&pVM); +RUNLOG_VAR("%p", var); if(pResult != NULL) var.Destruct(&pResult); @@ -2838,12 +2839,11 @@ InitGlobalClasses(void) /* the following classes were intialized by objClassInit() */ CHKiRet(objUse(errmsg, CORE_COMPONENT)); CHKiRet(objUse(module, CORE_COMPONENT)); + CHKiRet(objUse(var, CORE_COMPONENT)); /* initialize and use classes. We must be very careful with the order of events. Some * classes use others and if we do not initialize them in the right order, we may end * up with an invalid call. The most important thing that can happen is that an error - pErrObj = "var"; - CHKiRet(objUse(var, CORE_COMPONENT)); * is detected and needs to be logged, wich in turn requires a broader number of classes * to be available. The solution is that we take care in the order of calls AND use a * class immediately after it is initialized. And, of course, we load those classes |