Martchus
/
tagparser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use workaround for GCC Bug 66145

This commit is contained in:
Martchus 2016-06-14 22:53:43 +02:00
parent b7eef68fc6
commit cf5b021180
9 changed files with 83 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
abstractattachment.cpp
View File

@ -4,6 +4,7 @@
#include "./exceptions.h"
#include <c++utilities/misc/memory.h>
#include <c++utilities/io/catchiofailure.h>
#include <sstream>
@ -48,7 +49,7 @@ StreamDataBlock::StreamDataBlock(const std::function<std::istream & ()> &stream,
m_endOffset = s.tellg();
s.seekg(currentPos);
if(m_endOffset < m_startOffset) {
throw ios_base::failure("End offset is less then start offset.");
IoUtilities::throwIoFailure("End offset is less then start offset.");
}
}

7
avc/avcinfo.cpp
View File

@ -5,6 +5,7 @@
#include <c++utilities/io/binaryreader.h>
#include <c++utilities/io/bitreader.h>
#include <c++utilities/misc/memory.h>
#include <c++utilities/io/catchiofailure.h>
#include <unordered_map>
@ -200,7 +201,8 @@ void SpsInfo::parse(BinaryReader &reader, uint32 maxSize)
pictureSize.setWidth(mbSize.width() * 16);
pictureSize.setHeight((2 - frameMbsOnly) * mbSize.height() * 16);
}
} catch(const ios_base::failure &) {
} catch(...) {
catchIoFailure();
throw TruncatedDataException();
}
}
@ -239,7 +241,8 @@ void PpsInfo::parse(BinaryReader &reader, uint32 maxSize)
spsId = bitReader.readUnsignedExpGolombCodedBits<ugolomb>();
bitReader.skipBits(1); // entropy coding mode flag
picOrderPresent = bitReader.readBit();
} catch(const ios_base::failure &) {
} catch(...) {
catchIoFailure();
throw TruncatedDataException();
}
}

39
backuphelper.cpp
View File

@ -2,6 +2,7 @@
#include "./mediafileinfo.h"
#include <c++utilities/conversion/stringconversion.h>
#include <c++utilities/io/catchiofailure.h>
#ifdef PLATFORM_WINDOWS
# include <windows.h>
@ -16,6 +17,7 @@
using namespace std;
using namespace ConversionUtilities;
using namespace IoUtilities;
namespace Media {
@ -72,7 +74,7 @@ void restoreOriginalFileFromBackupFile(const std::string &originalPath, const st
if(backupStream.is_open()) {
backupStream.close();
} else {
throw ios_base::failure("Backup/temporary file has not been created.");
throwIoFailure("Backup/temporary file has not been created.");
}
// remove original file and restore backup
std::remove(originalPath.c_str());
@ -86,8 +88,9 @@ void restoreOriginalFileFromBackupFile(const std::string &originalPath, const st
originalStream.open(originalPath, ios_base::out | ios_base::binary);
originalStream << backupStream.rdbuf();
// TODO: callback for progress updates
} catch(const ios_base::failure &) {
throw ios_base::failure("Unable to restore original file from backup file \"" + backupPath + "\" after failure.");
} catch(...) {
catchIoFailure();
throwIoFailure(("Unable to restore original file from backup file \"" + backupPath + "\" after failure.").data());
}
}
}
@ -201,8 +204,9 @@ void createBackupFile(const std::string &originalPath, std::string &backupPath,
backupStream << originalStream.rdbuf();
// streams are closed in the next try-block
// TODO: callback for progress updates
} catch(const ios_base::failure &) {
throw ios_base::failure("Unable to rename original file before rewriting it.");
} catch(...) {
catchIoFailure();
throwIoFailure("Unable to rename original file before rewriting it.");
}
}
try {
@ -217,13 +221,14 @@ void createBackupFile(const std::string &originalPath, std::string &backupPath,
// open backup stream
backupStream.exceptions(ios_base::failbit | ios_base::badbit);
backupStream.open(backupPath, ios_base::in | ios_base::binary);
} catch(const ios_base::failure &) {
} catch(...) {
catchIoFailure();
// can't open the new file
// -> try to re-rename backup file in the error case to restore previous state
if(std::rename(backupPath.c_str(), originalPath.c_str()) != 0) {
throw ios_base::failure("Unable to restore original file from backup file \"" + backupPath + "\" after failure.");
throwIoFailure(("Unable to restore original file from backup file \"" + backupPath + "\" after failure.").data());
} else {
throw ios_base::failure("Unable to open backup file.");
throwIoFailure("Unable to open backup file.");
}
}
}
@ -263,8 +268,8 @@ void handleFailureAfterFileModified(MediaFileInfo &fileInfo, const std::string &
try {
restoreOriginalFileFromBackupFile(fileInfo.path(), backupPath, outputStream, backupStream);
fileInfo.addNotification(NotificationType::Information, "The original file has been restored.", context);
} catch(const ios_base::failure &ex) {
fileInfo.addNotification(NotificationType::Critical, ex.what(), context);
} catch(...) {
fileInfo.addNotification(NotificationType::Critical, catchIoFailure(), context);
}
} else {
fileInfo.addNotification(NotificationType::Information, "Applying new tag information has been aborted.", context);
@ -278,29 +283,29 @@ void handleFailureAfterFileModified(MediaFileInfo &fileInfo, const std::string &
try {
restoreOriginalFileFromBackupFile(fileInfo.path(), backupPath, outputStream, backupStream);
fileInfo.addNotification(NotificationType::Information, "The original file has been restored.", context);
} catch(const ios_base::failure &ex) {
fileInfo.addNotification(NotificationType::Critical, ex.what(), context);
} catch(...) {
fileInfo.addNotification(NotificationType::Critical, catchIoFailure(), context);
}
} else {
fileInfo.addNotification(NotificationType::Critical, "Applying new tag information failed.", context);
}
throw;
} catch(const ios_base::failure &) {
} catch(...) {
const char *what = catchIoFailure();
if(!backupPath.empty()) {
// a temp/backup file has been created -> restore original file
fileInfo.addNotification(NotificationType::Critical, "An IO error occured when rewriting the file to apply changed tag information.", context);
try {
restoreOriginalFileFromBackupFile(fileInfo.path(), backupPath, outputStream, backupStream);
fileInfo.addNotification(NotificationType::Information, "The original file has been restored.", context);
} catch(const ios_base::failure &ex) {
fileInfo.addNotification(NotificationType::Critical, ex.what(), context);
} catch(...) {
fileInfo.addNotification(NotificationType::Critical, catchIoFailure(), context);
}
} else {
fileInfo.addNotification(NotificationType::Critical, "An IO error occured when applying tag information.", context);
}
throw;
throwIoFailure(what);
}
}

21
matroska/matroskacontainer.cpp
View File

@ -12,6 +12,7 @@
#include "resources/config.h"
#include <c++utilities/conversion/stringconversion.h>
#include <c++utilities/io/catchiofailure.h>
#include <c++utilities/misc/memory.h>
#include <unistd.h>
@ -1319,9 +1320,10 @@ nonRewriteCalculations:
} catch(const Failure &) {
addNotification(NotificationType::Critical, "Parsing the original file failed.", context);
throw;
} catch(const ios_base::failure &) {
} catch(...) {
const char *what = catchIoFailure();
addNotification(NotificationType::Critical, "An IO error occured when parsing the original file.", context);
throw;
throwIoFailure(what);
}
if(isAborted()) {
@ -1346,9 +1348,10 @@ nonRewriteCalculations:
BackupHelper::createBackupFile(fileInfo().path(), backupPath, outputStream, backupStream);
// recreate original file, define buffer variables
outputStream.open(fileInfo().path(), ios_base::out | ios_base::binary | ios_base::trunc);
} catch(const ios_base::failure &) {
} catch(...) {
const char *what = catchIoFailure();
addNotification(NotificationType::Critical, "Creation of temporary file (to rewrite the original file) failed.", context);
throw;
throwIoFailure(what);
}
} else {
// open the current file as backupStream and create a new outputStream at the specified "save file path"
@ -1357,9 +1360,10 @@ nonRewriteCalculations:
backupStream.open(fileInfo().path(), ios_base::in | ios_base::binary);
fileInfo().close();
outputStream.open(fileInfo().saveFilePath(), ios_base::out | ios_base::binary | ios_base::trunc);
} catch(const ios_base::failure &) {
} catch(...) {
const char *what = catchIoFailure();
addNotification(NotificationType::Critical, "Opening streams to write output file failed.", context);
throw;
throwIoFailure(what);
}
}
@ -1378,9 +1382,10 @@ nonRewriteCalculations:
try {
fileInfo().close();
outputStream.open(fileInfo().path(), ios_base::in | ios_base::out | ios_base::binary);
} catch(const ios_base::failure &) {
} catch(...) {
const char *what = catchIoFailure();
addNotification(NotificationType::Critical, "Opening the file with write permissions failed.", context);
throw;
throwIoFailure(what);
}
}

18
mediafileinfo.cpp
View File

@ -31,6 +31,7 @@
#include "./flac/flacmetadata.h"
#include <c++utilities/conversion/stringconversion.h>
#include <c++utilities/io/catchiofailure.h>
#include <c++utilities/chrono/timespan.h>
#include <c++utilities/misc/memory.h>
@ -1507,7 +1508,7 @@ void MediaFileInfo::makeMp3File()
reportSizeChanged(size() - 128);
} else {
addNotification(NotificationType::Critical, "Unable to truncate file to remove ID3v1 tag.", context);
throw ios_base::failure("Unable to truncate file to remove ID3v1 tag.");
throwIoFailure("Unable to truncate file to remove ID3v1 tag.");
}
}
@ -1613,9 +1614,10 @@ void MediaFileInfo::makeMp3File()
BackupHelper::createBackupFile(path(), backupPath, outputStream, backupStream);
// recreate original file, define buffer variables
outputStream.open(path(), ios_base::out | ios_base::binary | ios_base::trunc);
} catch(const ios_base::failure &) {
} catch(...) {
const char *what = catchIoFailure();
addNotification(NotificationType::Critical, "Creation of temporary file (to rewrite the original file) failed.", context);
throw;
throwIoFailure(what);
}
} else {
// open the current file as backupStream and create a new outputStream at the specified "save file path"
@ -1623,9 +1625,10 @@ void MediaFileInfo::makeMp3File()
backupStream.exceptions(ios_base::badbit | ios_base::failbit);
backupStream.open(path(), ios_base::in | ios_base::binary);
outputStream.open(m_saveFilePath, ios_base::out | ios_base::binary | ios_base::trunc);
} catch(const ios_base::failure &) {
} catch(...) {
const char *what = catchIoFailure();
addNotification(NotificationType::Critical, "Opening streams to write output file failed.", context);
throw;
throwIoFailure(what);
}
}
@ -1634,9 +1637,10 @@ void MediaFileInfo::makeMp3File()
try {
close();
outputStream.open(path(), ios_base::in | ios_base::out | ios_base::binary);
} catch(const ios_base::failure &) {
} catch(...) {
const char *what = catchIoFailure();
addNotification(NotificationType::Critical, "Opening the file with write permissions failed.", context);
throw;
throwIoFailure(what);
}
}

16
mp4/mp4container.cpp
View File

@ -8,6 +8,7 @@
#include <c++utilities/io/binaryreader.h>
#include <c++utilities/io/binarywriter.h>
#include <c++utilities/io/copy.h>
#include <c++utilities/io/catchiofailure.h>
#include <c++utilities/misc/memory.h>
#include <unistd.h>
@ -498,9 +499,10 @@ calculatePadding:
BackupHelper::createBackupFile(fileInfo().path(), backupPath, outputStream, backupStream);
// recreate original file, define buffer variables
outputStream.open(fileInfo().path(), ios_base::out | ios_base::binary | ios_base::trunc);
} catch(const ios_base::failure &) {
} catch(...) {
const char *what = catchIoFailure();
addNotification(NotificationType::Critical, "Creation of temporary file (to rewrite the original file) failed.", context);
throw;
throwIoFailure(what);
}
} else {
// open the current file as backupStream and create a new outputStream at the specified "save file path"
@ -509,9 +511,10 @@ calculatePadding:
backupStream.open(fileInfo().path(), ios_base::in | ios_base::binary);
fileInfo().close();
outputStream.open(fileInfo().saveFilePath(), ios_base::out | ios_base::binary | ios_base::trunc);
} catch(const ios_base::failure &) {
} catch(...) {
const char *what = catchIoFailure();
addNotification(NotificationType::Critical, "Opening streams to write output file failed.", context);
throw;
throwIoFailure(what);
}
}
@ -525,9 +528,10 @@ calculatePadding:
try {
fileInfo().close();
outputStream.open(fileInfo().path(), ios_base::in | ios_base::out | ios_base::binary);
} catch(const ios_base::failure &) {
} catch(...) {
const char *what = catchIoFailure();
addNotification(NotificationType::Critical, "Opening the file with write permissions failed.", context);
throw;
throwIoFailure(what);
}
}

10
mp4/mp4track.cpp
View File

@ -15,6 +15,7 @@
#include <c++utilities/io/binaryreader.h>
#include <c++utilities/io/binarywriter.h>
#include <c++utilities/io/bitreader.h>
#include <c++utilities/io/catchiofailure.h>
#include <locale>
#include <cmath>
@ -645,16 +646,17 @@ unique_ptr<Mpeg4AudioSpecificConfig> Mp4Track::parseAudioSpecificConfig(StatusPr
audioCfg->psPresent = bitReader.readBit();
}
}
} catch(ios_base::failure &) {
} catch(const NotImplementedException &) {
statusProvider.addNotification(NotificationType::Information, "Not implemented for the format of audio track.", context);
} catch(...) {
const char *what = catchIoFailure();
if(stream.fail()) {
// IO error caused by input stream
throw;
throwIoFailure(what);
} else {
// IO error caused by bitReader
statusProvider.addNotification(NotificationType::Critical, "Audio specific configuration is truncated.", context);
}
} catch(NotImplementedException &) {
statusProvider.addNotification(NotificationType::Information, "Not implemented for the format of audio track.", context);
}
return audioCfg;
}

11
ogg/oggcontainer.cpp
View File

@ -6,6 +6,7 @@
#include "../backuphelper.h"
#include <c++utilities/io/copy.h>
#include <c++utilities/io/catchiofailure.h>
#include <c++utilities/misc/memory.h>
using namespace std;
@ -338,9 +339,10 @@ void OggContainer::internalMakeFile()
BackupHelper::createBackupFile(fileInfo().path(), backupPath, fileInfo().stream(), backupStream);
// recreate original file, define buffer variables
fileInfo().stream().open(fileInfo().path(), ios_base::out | ios_base::binary | ios_base::trunc);
} catch(const ios_base::failure &) {
} catch(...) {
const char *what = catchIoFailure();
addNotification(NotificationType::Critical, "Creation of temporary file (to rewrite the original file) failed.", context);
throw;
throwIoFailure(what);
}
} else {
// open the current file as backupStream and create a new outputStream at the specified "save file path"
@ -349,9 +351,10 @@ void OggContainer::internalMakeFile()
backupStream.open(fileInfo().path(), ios_base::in | ios_base::binary);
fileInfo().close();
fileInfo().stream().open(fileInfo().saveFilePath(), ios_base::out | ios_base::binary | ios_base::trunc);
} catch(const ios_base::failure &) {
} catch(...) {
const char *what = catchIoFailure();
addNotification(NotificationType::Critical, "Opening streams to write output file failed.", context);
throw;
throwIoFailure(what);
}
}

11
vorbis/vorbiscommentfield.cpp
View File

@ -11,6 +11,7 @@
#include <c++utilities/io/binaryreader.h>
#include <c++utilities/io/binarywriter.h>
#include <c++utilities/io/catchiofailure.h>
#include <c++utilities/conversion/binaryconversion.h>
#include <c++utilities/conversion/stringconversion.h>
#include <c++utilities/misc/memory.h>
@ -80,15 +81,16 @@ void VorbisCommentField::internalParse(StreamType &stream, uint64 &maxSize)
FlacMetaDataBlockPicture pictureBlock(value());
pictureBlock.parse(bufferStream, decoded.second);
setTypeInfo(pictureBlock.pictureType());
} catch(const ios_base::failure &) {
addNotification(NotificationType::Critical, "An IO error occured when reading the METADATA_BLOCK_PICTURE struct.", context);
throw Failure();
} catch(const TruncatedDataException &) {
addNotification(NotificationType::Critical, "METADATA_BLOCK_PICTURE is truncated.", context);
throw;
} catch(const ConversionException &) {
addNotification(NotificationType::Critical, "Base64 coding of METADATA_BLOCK_PICTURE is invalid.", context);
throw InvalidDataException();
} catch(...) {
catchIoFailure();
addNotification(NotificationType::Critical, "An IO error occured when reading the METADATA_BLOCK_PICTURE struct.", context);
throw Failure();
}
} else if(id().size() + 1 < size) {
// extract other values (as string)
@ -186,7 +188,8 @@ bool VorbisCommentField::make(BinaryWriter &writer, VorbisCommentFlags flags)
pictureBlock.make(bufferStream);
valueString = encodeBase64(reinterpret_cast<byte *>(buffer.get()), requiredSize);
} catch (const ios_base::failure &) {
} catch(...) {
catchIoFailure();
addNotification(NotificationType::Critical, "An IO error occured when writing the METADATA_BLOCK_PICTURE struct.", context);
throw Failure();
}