From a20eb3a317d69ec8a01f05e88c4e0b3b73308293 Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paravelsystems.com>
Date: Thu, 1 Sep 2022 16:03:43 -0400
Subject: [PATCH] 2022-09-01 Fred Gleason <fredg@paravelsystems.com> *
Fixed a bug in rdlogmanager(1) that could cause a segfault when
merging a log.
Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
---
ChangeLog | 3 +++
lib/rdevent_line.cpp | 8 +++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 44045171..eca66c34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20921,3 +20921,6 @@
2022-08-31 Fred Gleason <fredg@paravelsystems.com>
* Renamed the 'CD Metadata Source' control in rdlibrary(1) to use
'CDDB' instead of 'FreeDB' when configuring CDDB lookups.
+2022-09-01 Fred Gleason <fredg@paravelsystems.com>
+ * Fixed a bug in rdlogmanager(1) that could cause a segfault when
+ merging a log.
diff --git a/lib/rdevent_line.cpp b/lib/rdevent_line.cpp
index d5e6e080..e1b27293 100644
--- a/lib/rdevent_line.cpp
+++ b/lib/rdevent_line.cpp
@@ -1120,9 +1120,11 @@ bool RDEventLine::linkLog(RDLogEvent *e,RDLog *log,const QString &svcname,
//
// Apply Leading Event Values
//
- logline->setGraceTime(grace_time);
- logline->setTimeType(time_type);
- logline->setTransType(trans_type);
+ if(logline!=NULL) {
+ logline->setGraceTime(grace_time);
+ logline->setTimeType(time_type);
+ logline->setTransType(trans_type);
+ }
//
// Clear Leading Event Values