From 4c290c5204537489af5bd0abaffa212e1cd15416 Mon Sep 17 00:00:00 2001
From: Nikolaj Schlej <schlej@live.de>
Date: Tue, 17 Feb 2015 23:46:15 +0100
Subject: [PATCH] Engine 0.20.4

- solved a crash during handling of a malformed DEPEX section
---
 UEFIExtract/uefiextract_main.cpp | 2 +-
 UEFIFind/uefifind_main.cpp       | 2 +-
 UEFIPatch/uefipatch_main.cpp     | 2 +-
 ffsengine.cpp                    | 4 ++++
 uefitool.cpp                     | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/UEFIExtract/uefiextract_main.cpp b/UEFIExtract/uefiextract_main.cpp
index 0e7123b..83b8c29 100644
--- a/UEFIExtract/uefiextract_main.cpp
+++ b/UEFIExtract/uefiextract_main.cpp
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
     
   }
   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 <<
     "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;
diff --git a/UEFIFind/uefifind_main.cpp b/UEFIFind/uefifind_main.cpp
index bcd5c2e..ebe87b7 100644
--- a/UEFIFind/uefifind_main.cpp
+++ b/UEFIFind/uefifind_main.cpp
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
         return ERR_SUCCESS;
     }
     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";
         return ERR_INVALID_PARAMETER;
     }
diff --git a/UEFIPatch/uefipatch_main.cpp b/UEFIPatch/uefipatch_main.cpp
index 8d6e44b..2ff15c9 100644
--- a/UEFIPatch/uefipatch_main.cpp
+++ b/UEFIPatch/uefipatch_main.cpp
@@ -31,7 +31,7 @@ int main(int argc, char *argv[])
         result = w.patchFromFile(a.arguments().at(1));
     }
     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 <<
             "Patches will be read from patches.txt file\n";
         return ERR_SUCCESS;
diff --git a/ffsengine.cpp b/ffsengine.cpp
index 3cb316e..0ee3f97 100644
--- a/ffsengine.cpp
+++ b/ffsengine.cpp
@@ -1256,6 +1256,7 @@ UINT8 FfsEngine::parseDepexSection(const QByteArray & body, QString & parsed)
         current += EFI_DEP_OPCODE_SIZE;
         break;
     default:
+		return ERR_DEPEX_PARSE_FAILED;
         break;
     }
 
@@ -1305,6 +1306,9 @@ UINT8 FfsEngine::parseDepexSection(const QByteArray & body, QString & parsed)
                 return ERR_DEPEX_PARSE_FAILED;
             }
             break;
+		default:
+			return ERR_DEPEX_PARSE_FAILED;
+			break;
         }
     }
 
diff --git a/uefitool.cpp b/uefitool.cpp
index 3aacd10..0f344f2 100644
--- a/uefitool.cpp
+++ b/uefitool.cpp
@@ -17,7 +17,7 @@
 UEFITool::UEFITool(QWidget *parent) :
 QMainWindow(parent),
 ui(new Ui::UEFITool), 
-version(tr("0.20.3"))
+version(tr("0.20.4"))
 {
     clipboard = QApplication::clipboard();