Ticket #167: mtdiso.patch

File mtdiso.patch, 1.6 KB (added by Anduin Withers <awithers@…>, 19 years ago)

  • jobthread.cpp

     
    565565                            nice_priority)
    566566
    567567{
     568    char *denv_file = getenv("MTD_DEBUG_TEST_DVD_FILE");
     569    if (denv_file)
     570    {
     571        dvd_device_location = denv_file;
     572        std::cout << QString("Using test DVD source: %1").
     573                arg(dvd_device_location) << std::endl;
     574    }
    568575}
    569576
    570577void DVDISOCopyThread::run()
    … …  
    638645    off_t dvd_size = lseek(file, 0, SEEK_END);
    639646    lseek(file, 0, SEEK_SET);
    640647
    641     int buf_size = 4098;
    642     unsigned char *buffer = new unsigned char[buf_size];
     648    const int buf_size = 4098;
     649    unsigned char buffer[buf_size];
    643650    long long total_bytes(0);
    644651
    645652    QTime job_time;
    … …  
    655662            ripfile->remove();
    656663            delete ripfile;
    657664            ripfile = NULL;
    658             delete buffer;
    659665            dvd_device_access->unlock();
    660666            return false;
    661667        }
    … …  
    670676            ripfile->remove();
    671677            delete ripfile;
    672678            ripfile = NULL;
    673             delete buffer;
    674679            dvd_device_access->unlock();
    675680            return false;
    676681        }
    … …  
    693698            ripfile->remove();
    694699            delete ripfile;
    695700            ripfile = NULL;
    696             delete buffer;
    697701            dvd_device_access->unlock();
    698702            return false;
    699703        }
    700704    }
    701705
    702     delete buffer;
    703706    ripfile->close();
    704     delete ripfile;
    705707    dvd_device_access->unlock();
    706708    sendLoggingEvent("job thread finished copying ISO image");
    707709    return true;