Hello community, here is the log from the commit of package qmmp for openSUSE:Factory checked in at 2016-07-26 13:00:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qmmp (Old) and /work/SRC/openSUSE:Factory/.qmmp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qmmp" Changes: -------- --- /work/SRC/openSUSE:Factory/qmmp/qmmp.changes 2016-07-05 09:53:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qmmp.new/qmmp.changes 2016-07-26 13:13:10.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Jul 23 16:15:39 UTC 2016 - [email protected] + +- Update to version 1.1.2: + * Fix path to equaliser presets file in the qsui plugin. + * Fix buffer overflow. + +------------------------------------------------------------------- Old: ---- qmmp-1.1.1.tar.bz2 New: ---- qmmp-1.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qmmp.spec ++++++ --- /var/tmp/diff_new_pack.t9gcb6/_old 2016-07-26 13:13:11.000000000 +0200 +++ /var/tmp/diff_new_pack.t9gcb6/_new 2016-07-26 13:13:11.000000000 +0200 @@ -19,7 +19,7 @@ %define sover 1 %bcond_with restricted Name: qmmp -Version: 1.1.1 +Version: 1.1.2 Release: 0 Summary: Qt-based Multimedia Player License: GPL-2.0+ ++++++ qmmp-1.1.1.tar.bz2 -> qmmp-1.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-1.1.1/ChangeLog new/qmmp-1.1.2/ChangeLog --- old/qmmp-1.1.1/ChangeLog 2016-07-04 18:34:56.000000000 +0200 +++ new/qmmp-1.1.2/ChangeLog 2016-07-23 15:16:21.000000000 +0200 @@ -1196,3 +1196,7 @@ * fixed Russian translation * updated Ukrainian translation (Gennadi Motsyo) * updated Portuguese translation (Sérgio Marques) + +Version 1.1.2 +* fixed path to equalizer presets file in the qsui plugin (Ryota Shimamoto) +* fixed buffer overflow diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-1.1.1/ChangeLog.rus new/qmmp-1.1.2/ChangeLog.rus --- old/qmmp-1.1.1/ChangeLog.rus 2016-07-04 18:34:56.000000000 +0200 +++ new/qmmp-1.1.2/ChangeLog.rus 2016-07-23 15:16:21.000000000 +0200 @@ -1198,3 +1198,7 @@ * исправлен русский перевод * обновлён украинский перевод (Геннадий Моцьо) * обновлён португальский перевод (Sérgio Marques) + +Версия 1.1.2 +* исправлен путь к файлу настроек эквалайзера в модуле qsui (Ryota Shimamoto) +* устранено переполнение буфера diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-1.1.1/ChangeLog.svn new/qmmp-1.1.2/ChangeLog.svn --- old/qmmp-1.1.1/ChangeLog.svn 2016-07-04 18:34:56.000000000 +0200 +++ new/qmmp-1.1.2/ChangeLog.svn 2016-07-23 15:16:21.000000000 +0200 @@ -1,4 +1,20 @@ ------------------------------------------------------------------------ +r6591 | trialuser02 | 2016-07-23 15:27:09 +0300 (Сб., 23 июля 2016) | 1 line + +updated changelog +------------------------------------------------------------------------ +r6588 | trialuser02 | 2016-07-23 15:16:35 +0300 (Сб., 23 июля 2016) | 1 line + +fixed buffer overflow +------------------------------------------------------------------------ +r6579 | trialuser02 | 2016-07-06 08:30:23 +0300 (Ср., 06 июля 2016) | 1 line + +qsui: fixed equalizer presets file path (Ryota Shimamoto) +------------------------------------------------------------------------ +r6573 | trialuser02 | 2016-07-04 19:43:05 +0300 (Пн., 04 июля 2016) | 1 line + +version bump +------------------------------------------------------------------------ r6562 | trialuser02 | 2016-07-04 16:17:56 +0300 (Пн., 04 июля 2016) | 1 line updated changelogs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-1.1.1/qmmp.pri new/qmmp-1.1.2/qmmp.pri --- old/qmmp-1.1.1/qmmp.pri 2016-07-04 18:34:56.000000000 +0200 +++ new/qmmp-1.1.2/qmmp.pri 2016-07-23 15:16:21.000000000 +0200 @@ -13,7 +13,7 @@ #Version -QMMP_VERSION = 1.1.1 +QMMP_VERSION = 1.1.2 #Comment/uncomment this if you want to change plugins list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-1.1.1/src/app/qmmp.rc new/qmmp-1.1.2/src/app/qmmp.rc --- old/qmmp-1.1.1/src/app/qmmp.rc 2016-07-04 18:34:56.000000000 +0200 +++ new/qmmp-1.1.2/src/app/qmmp.rc 2016-07-23 15:16:20.000000000 +0200 @@ -1,7 +1,7 @@ #include <winver.h> -#define QMMP_FILEVERSION 1,1,1,0 -#define QMMP_PRODUCTVERSION "1.1.1.0" +#define QMMP_FILEVERSION 1,1,2,0 +#define QMMP_PRODUCTVERSION "1.1.2.0" IDI_ICON1 ICON DISCARDABLE "images\\ico\\qmmp.ico" IDI_ICON2 ICON DISCARDABLE "images\\ico\\qmmp_file.ico" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-1.1.1/src/plugins/Ui/qsui/equalizer.cpp new/qmmp-1.1.2/src/plugins/Ui/qsui/equalizer.cpp --- old/qmmp-1.1.1/src/plugins/Ui/qsui/equalizer.cpp 2016-07-04 18:34:56.000000000 +0200 +++ new/qmmp-1.1.2/src/plugins/Ui/qsui/equalizer.cpp 2016-07-23 15:16:20.000000000 +0200 @@ -140,7 +140,7 @@ { m_presetComboBox->clear(); //equalizer presets - QString preset_path = Qmmp::configDir() + "q15.preset"; + QString preset_path = Qmmp::configDir() + "eq15.preset"; if(!QFile::exists(preset_path)) preset_path = ":/qsui/eq15.preset"; QSettings eq_preset (preset_path, QSettings::IniFormat); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-1.1.1/src/qmmp/outputwriter.cpp new/qmmp-1.1.2/src/qmmp/outputwriter.cpp --- old/qmmp-1.1.1/src/qmmp/outputwriter.cpp 2016-07-04 18:34:56.000000000 +0200 +++ new/qmmp-1.1.2/src/qmmp/outputwriter.cpp 2016-07-23 15:16:20.000000000 +0200 @@ -53,7 +53,6 @@ m_format_converter = 0; m_channel_converter = 0; m_output_buf = 0; - m_output_at = 0; } OutputWriter::~OutputWriter() @@ -104,8 +103,8 @@ if(m_output_buf) delete[] m_output_buf; - m_output_buf = new unsigned char[QMMP_BLOCK_FRAMES * m_channels * m_output->sampleSize() * 4]; - m_output_at = 0; + m_output_size = QMMP_BLOCK_FRAMES * m_channels * 4; + m_output_buf = new unsigned char[m_output_size * m_output->sampleSize()]; m_bytesPerMillisecond = m_frequency * m_channels * AudioParameters::sampleSize(m_format) / 1000; m_recycler.configure(m_in_params.sampleRate(), m_in_params.channels()); //calculate output buffer size @@ -274,6 +273,7 @@ Buffer *b = 0; quint64 l; qint64 m = 0; + size_t output_at = 0; dispatch(Qmmp::Playing); @@ -334,10 +334,18 @@ l = 0; m = 0; + //increase buffer size if needed + if(b->samples > m_output_size) + { + delete [] m_output_buf; + m_output_size = b->samples; + m_output_buf = new unsigned char[m_output_size * sampleSize()]; + } + m_format_converter->fromFloat(b->data, m_output_buf, b->samples); - m_output_at = b->samples * m_output->sampleSize(); + output_at = b->samples * m_output->sampleSize(); - while (l < m_output_at && !m_pause && !m_prev_pause) + while (l < output_at && !m_pause && !m_prev_pause) { mutex()->lock(); if(m_skip) @@ -348,7 +356,7 @@ break; } mutex()->unlock(); - m = m_output->writeAudio(m_output_buf + l, m_output_at - l); + m = m_output->writeAudio(m_output_buf + l, output_at - l); if(m >= 0) { m_totalWritten += m; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-1.1.1/src/qmmp/outputwriter_p.h new/qmmp-1.1.2/src/qmmp/outputwriter_p.h --- old/qmmp-1.1.1/src/qmmp/outputwriter_p.h 2016-07-04 18:34:56.000000000 +0200 +++ new/qmmp-1.1.2/src/qmmp/outputwriter_p.h 2016-07-23 15:16:20.000000000 +0200 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2012-2015 by Ilya Kotov * + * Copyright (C) 2012-2016 by Ilya Kotov * * [email protected] * * * * This program is free software; you can redistribute it and/or modify * @@ -141,7 +141,7 @@ AudioConverter *m_format_converter; ChannelConverter *m_channel_converter; unsigned char *m_output_buf; - size_t m_output_at; + size_t m_output_size; //samples }; #endif // OUTPUTWRITER_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-1.1.1/src/qmmp/qmmp.h new/qmmp-1.1.2/src/qmmp/qmmp.h --- old/qmmp-1.1.1/src/qmmp/qmmp.h 2016-07-04 18:34:56.000000000 +0200 +++ new/qmmp-1.1.2/src/qmmp/qmmp.h 2016-07-23 15:16:21.000000000 +0200 @@ -24,7 +24,7 @@ #define QMMP_VERSION_MAJOR 1 #define QMMP_VERSION_MINOR 1 -#define QMMP_VERSION_PATCH 1 +#define QMMP_VERSION_PATCH 2 #define QMMP_VERSION_STABLE 1 #define QMMP_VERSION_INT (QMMP_VERSION_MAJOR<<16 | QMMP_VERSION_MINOR<<8 | QMMP_VERSION_PATCH)
