matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Open Session: Fixing problem with previous commit where valid format file was also declared invalid/unkonwn

Browse Source
This commit is contained in:
Srivats P 2016-05-17 22:16:52 +05:30
parent ba754c1043
commit 8bea5636ab
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/nativefileformat.cpp
View File

@ -425,12 +425,16 @@ bool NativeFileFormat::isNativeFileFormat(
goto _close_exit; goto _close_exit;
if (magic.value() == kFileMagicValue) { if (magic.value() == kFileMagicValue) {
OstProto::FileMetaData meta; OstProto::FileMeta meta;
int metaSize = fileMetaSize((quint8*)buf.constData(), buf.size());
buf = file.peek(kFileMagicOffset + kFileMagicSize + metaSize);
if (!meta.ParseFromArray( if (!meta.ParseFromArray(
(void*)(buf.constData() + kFileMetaDataOffset), (void*)(buf.constData() + kFileMetaDataOffset), metaSize)) {
fileMetaSize((quint8*)buf.constData(), buf.size()))) qDebug("%s: File MetaData\n%s", __FUNCTION__,
QString().fromStdString(meta.DebugString()).toAscii().constData());
goto _close_exit; goto _close_exit;
if (meta.file_type() == fileType) }
if (meta.data().file_type() == fileType)
ret = true; ret = true;
} }