Engine 0.20.4

- solved a crash during handling of a malformed DEPEX section
This commit is contained in:
Nikolaj Schlej 2015-02-17 23:46:15 +01:00
parent 0fb1a57a97
commit 4c290c5204
5 changed files with 8 additions and 4 deletions

View file

@ -52,7 +52,7 @@ int main(int argc, char *argv[])
} }
else { else {
std::cout << "UEFIExtract 0.4.2" << std::endl << std::endl << std::cout << "UEFIExtract 0.4.4" << std::endl << std::endl <<
"Usage: uefiextract imagefile [FileGUID_1 FileGUID_2 ... FileGUID_31]" << std::endl << "Usage: uefiextract imagefile [FileGUID_1 FileGUID_2 ... FileGUID_31]" << std::endl <<
"Returned value is a bit mask where 0 on position N meant File with GUID_N was found and unpacked, 1 otherwise" << std::endl; "Returned value is a bit mask where 0 on position N meant File with GUID_N was found and unpacked, 1 otherwise" << std::endl;
return 1; return 1;

View file

@ -64,7 +64,7 @@ int main(int argc, char *argv[])
return ERR_SUCCESS; return ERR_SUCCESS;
} }
else { else {
std::cout << "UEFIFind 0.3.0" << std::endl << std::endl << std::cout << "UEFIFind 0.3.4" << std::endl << std::endl <<
"Usage: uefifind {header | body | all} {list | count} pattern imagefile\n"; "Usage: uefifind {header | body | all} {list | count} pattern imagefile\n";
return ERR_INVALID_PARAMETER; return ERR_INVALID_PARAMETER;
} }

View file

@ -31,7 +31,7 @@ int main(int argc, char *argv[])
result = w.patchFromFile(a.arguments().at(1)); result = w.patchFromFile(a.arguments().at(1));
} }
else { else {
std::cout << "UEFIPatch 0.3.2 - UEFI image file patching utility" << std::endl << std::endl << std::cout << "UEFIPatch 0.3.4 - UEFI image file patching utility" << std::endl << std::endl <<
"Usage: UEFIPatch image_file" << std::endl << std::endl << "Usage: UEFIPatch image_file" << std::endl << std::endl <<
"Patches will be read from patches.txt file\n"; "Patches will be read from patches.txt file\n";
return ERR_SUCCESS; return ERR_SUCCESS;

View file

@ -1256,6 +1256,7 @@ UINT8 FfsEngine::parseDepexSection(const QByteArray & body, QString & parsed)
current += EFI_DEP_OPCODE_SIZE; current += EFI_DEP_OPCODE_SIZE;
break; break;
default: default:
return ERR_DEPEX_PARSE_FAILED;
break; break;
} }
@ -1305,6 +1306,9 @@ UINT8 FfsEngine::parseDepexSection(const QByteArray & body, QString & parsed)
return ERR_DEPEX_PARSE_FAILED; return ERR_DEPEX_PARSE_FAILED;
} }
break; break;
default:
return ERR_DEPEX_PARSE_FAILED;
break;
} }
} }

View file

@ -17,7 +17,7 @@
UEFITool::UEFITool(QWidget *parent) : UEFITool::UEFITool(QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
ui(new Ui::UEFITool), ui(new Ui::UEFITool),
version(tr("0.20.3")) version(tr("0.20.4"))
{ {
clipboard = QApplication::clipboard(); clipboard = QApplication::clipboard();