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>
This commit is contained in:
Fred Gleason 2022-09-01 16:03:43 -04:00
parent c0ceda64f4
commit a20eb3a317
2 changed files with 8 additions and 3 deletions

View File

@ -20921,3 +20921,6 @@
2022-08-31 Fred Gleason <fredg@paravelsystems.com> 2022-08-31 Fred Gleason <fredg@paravelsystems.com>
* Renamed the 'CD Metadata Source' control in rdlibrary(1) to use * Renamed the 'CD Metadata Source' control in rdlibrary(1) to use
'CDDB' instead of 'FreeDB' when configuring CDDB lookups. '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.

View File

@ -1120,9 +1120,11 @@ bool RDEventLine::linkLog(RDLogEvent *e,RDLog *log,const QString &svcname,
// //
// Apply Leading Event Values // Apply Leading Event Values
// //
if(logline!=NULL) {
logline->setGraceTime(grace_time); logline->setGraceTime(grace_time);
logline->setTimeType(time_type); logline->setTimeType(time_type);
logline->setTransType(trans_type); logline->setTransType(trans_type);
}
// //
// Clear Leading Event Values // Clear Leading Event Values