2021-08-24 Fred Gleason <fredg@paravelsystems.com>

* Fixed a bug in rdlogmanager(1) that would cause a segfault when
	a cart was dropped in a Pre- or Post-Import list beneath the
	'--End of List--' marker.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-08-24 13:42:21 -04:00
parent 7fe52159a0
commit fc61172a55
2 changed files with 7 additions and 0 deletions

View File

@ -22340,3 +22340,7 @@
struct in the rd_listsystemsettings(7) man page.
2021-08-24 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in caed(8) that broke the build.
2021-08-24 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdlogmanager(1) that would cause a segfault when
a cart was dropped in a Pre- or Post-Import list beneath the
'--End of List--' marker.

View File

@ -388,6 +388,9 @@ QModelIndex ImportCartsModel::processCartDrop(int line,RDLogLine *ll)
{
int prev_len=totalLength();
if(line<0) {
line=lineCount();
}
if(ll->cartNumber()==0) { // Remove line
if(line>=lineCount()) { // Don't remove the end marker!
return QModelIndex();