From 07396cb96db660fe5015461af6d5401e16e50fb8 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Fri, 24 Aug 2018 14:48:49 -0400 Subject: [PATCH] 2018-06-24 Fred Gleason * Fixed a regression in rdlogmanager(1) that caused a segfault when generating a log. --- ChangeLog | 3 +++ lib/rdevent_line.cpp | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index eed2be38..9dc179f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17521,3 +17521,6 @@ * Changed the default value of the 'Collation=' parameter in the [mySQL] section of rd.conf(5) from 'latin1_swedish_ci' to 'utf8_general_ci'. +2018-06-24 Fred Gleason + * Fixed a regression in rdlogmanager(1) that caused a segfault + when generating a log. diff --git a/lib/rdevent_line.cpp b/lib/rdevent_line.cpp index 9e916df6..c3d2e3d3 100644 --- a/lib/rdevent_line.cpp +++ b/lib/rdevent_line.cpp @@ -522,13 +522,13 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname, QString().sprintf("EVENT_LENGTH=%d",event_length); RDSqlQuery::apply(sql); count++; - time=time.addMSecs(GetLength(q->value(2).toUInt())); + time=time.addMSecs(i_item->cartNumber()); trans_type=event_default_transtype; time_type=RDLogLine::Relative; post_point=false; grace_time=-1; - postimport_length+=GetLength(q->value(2).toUInt()); + postimport_length+=GetLength(i_item->cartNumber()); } // @@ -895,7 +895,7 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname, QString().sprintf("EVENT_LENGTH=%d",event_length); RDSqlQuery::apply(sql); count++; - time=time.addMSecs(GetLength(q->value(2).toUInt())); + time=time.addMSecs(GetLength(i_item->cartNumber())); time_type=RDLogLine::Relative; trans_type=event_default_transtype; post_point=false;