From 3c1a287469b70e84b5bf159d4c42474fa660b54f Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 4 Dec 2019 17:43:55 -0500 Subject: [PATCH] 2019-12-04 Fred Gleason * Fixed a bug in rdconvert that caused a segfault at startup. --- ChangeLog | 2 + utils/rdconvert/rdconvert.cpp | 99 ++++++++++++++++------------------- 2 files changed, 47 insertions(+), 54 deletions(-) diff --git a/ChangeLog b/ChangeLog index 80b63eae..c30ff809 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19302,3 +19302,5 @@ to be inserted when generating a log. 2019-12-04 Fred Gleason * Incremented the package version to 3.2.0int2. +2019-12-04 Fred Gleason + * Fixed a bug in rdconvert that caused a segfault at startup. diff --git a/utils/rdconvert/rdconvert.cpp b/utils/rdconvert/rdconvert.cpp index aeac7805..4ba275ad 100644 --- a/utils/rdconvert/rdconvert.cpp +++ b/utils/rdconvert/rdconvert.cpp @@ -2,7 +2,7 @@ // // Rivendell file format converter. // -// (C) Copyright 2017 Fred Gleason +// (C) Copyright 2017-2019 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,6 +20,7 @@ #include +#include #include #include #include @@ -29,7 +30,7 @@ MainObject::MainObject(QObject *parent) :QObject(parent) { - int schema=0; + QString err_msg; destination_settings=new RDSettings(); start_point=-1; @@ -38,46 +39,46 @@ MainObject::MainObject(QObject *parent) bool ok=false; RDAudioConvert::ErrorCode conv_err; + // + // Open the Database + // + rda=new RDApplication("rdconvert","rdconvert",RDCONVERT_USAGE,this); + if(!rda->open(&err_msg)) { + fprintf(stderr,"rdconvert: %s\n",(const char *)err_msg); + exit(1); + } + // // Read Command Options // - RDCmdSwitch *cmd= - new RDCmdSwitch(qApp->argc(),qApp->argv(),"rdconvert", - RDCONVERT_USAGE); - if(cmd->keys()<1) { + if(rda->cmdSwitch()->keys()<1) { fprintf(stderr,"rdconvert: missing argument\n"); exit(256); } - source_filename=cmd->key(cmd->keys()-1); - for(unsigned i=0;ikeys()-1;i++) { - /* - if(cmd->key(i)=="--source-file") { - source_filename=cmd->value(i); - cmd->setProcessed(i,true); + source_filename=rda->cmdSwitch()->key(rda->cmdSwitch()->keys()-1); + for(unsigned i=0;icmdSwitch()->keys()-1;i++) { + if(rda->cmdSwitch()->key(i)=="--destination-file") { + destination_filename=rda->cmdSwitch()->value(i); + rda->cmdSwitch()->setProcessed(i,true); } - */ - if(cmd->key(i)=="--destination-file") { - destination_filename=cmd->value(i); - cmd->setProcessed(i,true); - } - if(cmd->key(i)=="--start-point") { - start_point=cmd->value(i).toInt(&ok); + if(rda->cmdSwitch()->key(i)=="--start-point") { + start_point=rda->cmdSwitch()->value(i).toInt(&ok); if(!ok) { fprintf(stderr,"rdconvert: invalid start point\n"); exit(256); } - cmd->setProcessed(i,true); + rda->cmdSwitch()->setProcessed(i,true); } - if(cmd->key(i)=="--end-point") { - end_point=cmd->value(i).toInt(&ok); + if(rda->cmdSwitch()->key(i)=="--end-point") { + end_point=rda->cmdSwitch()->value(i).toInt(&ok); if(!ok) { fprintf(stderr,"rdconvert: invalid end point\n"); exit(256); } - cmd->setProcessed(i,true); + rda->cmdSwitch()->setProcessed(i,true); } - if(cmd->key(i)=="--destination-format") { - RDSettings::Format format=(RDSettings::Format)cmd->value(i).toInt(&ok); + if(rda->cmdSwitch()->key(i)=="--destination-format") { + RDSettings::Format format=(RDSettings::Format)rda->cmdSwitch()->value(i).toInt(&ok); if(!ok) { fprintf(stderr,"rdconvert: invalid destination format\n"); exit(256); @@ -91,7 +92,7 @@ MainObject::MainObject(QObject *parent) case RDSettings::Flac: case RDSettings::OggVorbis: destination_settings->setFormat(format); - cmd->setProcessed(i,true); + rda->cmdSwitch()->setProcessed(i,true); break; default: @@ -100,58 +101,58 @@ MainObject::MainObject(QObject *parent) } destination_settings->setFormat(format); } - if(cmd->key(i)=="--destination-channels") { - unsigned channels=cmd->value(i).toInt(&ok); + if(rda->cmdSwitch()->key(i)=="--destination-channels") { + unsigned channels=rda->cmdSwitch()->value(i).toInt(&ok); if(!ok) { fprintf(stderr,"rdconvert: invalid destination channels\n"); exit(256); } destination_settings->setChannels(channels); - cmd->setProcessed(i,true); + rda->cmdSwitch()->setProcessed(i,true); } - if(cmd->key(i)=="--destination-sample-rate") { - unsigned sample_rate=cmd->value(i).toInt(&ok); + if(rda->cmdSwitch()->key(i)=="--destination-sample-rate") { + unsigned sample_rate=rda->cmdSwitch()->value(i).toInt(&ok); if(!ok) { fprintf(stderr,"rdconvert: invalid destination sample rate\n"); exit(256); } destination_settings->setSampleRate(sample_rate); - cmd->setProcessed(i,true); + rda->cmdSwitch()->setProcessed(i,true); } - if(cmd->key(i)=="--destination-bit-rate") { - unsigned bit_rate=cmd->value(i).toInt(&ok); + if(rda->cmdSwitch()->key(i)=="--destination-bit-rate") { + unsigned bit_rate=rda->cmdSwitch()->value(i).toInt(&ok); if(!ok) { fprintf(stderr,"rdconvert: invalid destination bit rate\n"); exit(256); } destination_settings->setBitRate(bit_rate); - cmd->setProcessed(i,true); + rda->cmdSwitch()->setProcessed(i,true); } - if(cmd->key(i)=="--quality") { - unsigned quality=cmd->value(i).toInt(&ok); + if(rda->cmdSwitch()->key(i)=="--quality") { + unsigned quality=rda->cmdSwitch()->value(i).toInt(&ok); if(!ok) { fprintf(stderr,"rdconvert: invalid destination quality\n"); exit(256); } destination_settings->setQuality(quality); - cmd->setProcessed(i,true); + rda->cmdSwitch()->setProcessed(i,true); } - if(cmd->key(i)=="--normalization-level") { - int normalization_level=cmd->value(i).toInt(&ok); + if(rda->cmdSwitch()->key(i)=="--normalization-level") { + int normalization_level=rda->cmdSwitch()->value(i).toInt(&ok); if((!ok)||(normalization_level>0)) { fprintf(stderr,"rdconvert: invalid normalization level\n"); exit(256); } destination_settings->setNormalizationLevel(normalization_level); - cmd->setProcessed(i,true); + rda->cmdSwitch()->setProcessed(i,true); } - if(cmd->key(i)=="--speed-ratio") { - speed_ratio=cmd->value(i).toFloat(&ok); + if(rda->cmdSwitch()->key(i)=="--speed-ratio") { + speed_ratio=rda->cmdSwitch()->value(i).toFloat(&ok); if((!ok)||(speed_ratio<=0)) { fprintf(stderr,"rdconvert: invalid speed-ratio\n"); exit(256); } - cmd->setProcessed(i,true); + rda->cmdSwitch()->setProcessed(i,true); } } if(source_filename.isEmpty()) { @@ -175,16 +176,6 @@ MainObject::MainObject(QObject *parent) rdconfig->load(); rdconfig->setModuleName("rdconvert"); - // - // Open Database - // - QString err (tr("rdconvert: ")); - if(!RDOpenDb(&schema,&err,rdconfig)) { - fprintf(stderr,err.ascii()); - delete cmd; - exit(256); - } - RDAudioConvert *conv=new RDAudioConvert(this); conv->setSourceFile(source_filename); conv->setDestinationFile(destination_filename);