From aa0ab13411851e4bfc082305ca827e4ab3c7083c Mon Sep 17 00:00:00 2001
From: vit9696 <vit9696@users.noreply.github.com>
Date: Sun, 11 Nov 2018 14:15:11 +0300
Subject: [PATCH] Fix duplicates in UEFIExtract

---
 UEFIExtract/ffsdumper.cpp | 44 +++++++++++++++++++++++----------------
 UEFIExtract/ffsdumper.h   |  3 +++
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/UEFIExtract/ffsdumper.cpp b/UEFIExtract/ffsdumper.cpp
index 1dbf19e..4604f62 100644
--- a/UEFIExtract/ffsdumper.cpp
+++ b/UEFIExtract/ffsdumper.cpp
@@ -19,6 +19,7 @@ USTATUS FfsDumper::dump(const UModelIndex & root, const UString & path, const Du
 {
     dumped = false;
     counterHeader = counterBody = counterRaw = counterInfo = 0;
+    fileList.clear();
 
     if (changeDirectory(path))
         return U_DIR_ALREADY_EXIST;
@@ -57,7 +58,9 @@ USTATUS FfsDumper::recursiveDump(const UModelIndex & index, const UString & path
 
         if (dumpMode == DUMP_ALL || model->rowCount(index) == 0)  { // Dump if leaf item or dumpAll is true
             if (dumpMode == DUMP_ALL || dumpMode == DUMP_CURRENT || dumpMode == DUMP_HEADER) {
-                if (!model->header(index).isEmpty() && (sectionType == IgnoreSectionType || model->subtype(index) == sectionType)) {
+                if (!model->header(index).isEmpty() && (sectionType == IgnoreSectionType || model->subtype(index) == sectionType) &&
+                    fileList.count(index) == 0) {
+                    fileList.insert(index);
                     UString filename;
                     if (counterHeader == 0)
                         filename = usprintf("%s/header.bin", path.toLocal8Bit());
@@ -75,7 +78,9 @@ USTATUS FfsDumper::recursiveDump(const UModelIndex & index, const UString & path
             }
 
             if (dumpMode == DUMP_ALL || dumpMode == DUMP_CURRENT || dumpMode == DUMP_BODY) {
-                if (!model->body(index).isEmpty() && (sectionType == IgnoreSectionType || model->subtype(index) == sectionType)) {
+                if (!model->body(index).isEmpty() && (sectionType == IgnoreSectionType || model->subtype(index) == sectionType) &&
+                    fileList.count(index) == 0) {
+                    fileList.insert(index);
                     UString filename;
                     if (counterBody == 0)
                         filename = usprintf("%s/body.bin", path.toLocal8Bit());
@@ -99,23 +104,26 @@ USTATUS FfsDumper::recursiveDump(const UModelIndex & index, const UString & path
                     if (!fileIndex.isValid())
                         fileIndex = index;
                 }
-                UString filename;
-                if (counterRaw == 0)
-                    filename = usprintf("%s/file.ffs", path.toLocal8Bit());
-                else
-                    filename = usprintf("%s/file_%d.ffs", path.toLocal8Bit(), counterRaw);
-                counterRaw++;
-                std::ofstream file(filename.toLocal8Bit(), std::ofstream::binary);
-                if (!file)
-                    return U_FILE_OPEN;
-                const UByteArray &headerData = model->header(fileIndex);
-                const UByteArray &bodyData = model->body(fileIndex);
-                const UByteArray &tailData = model->tail(fileIndex);
-                file.write(headerData.constData(), headerData.size());
-                file.write(bodyData.constData(), bodyData.size());
-                file.write(tailData.constData(), tailData.size());
+                if (fileList.count(fileIndex) == 0) {
+                    fileList.insert(fileIndex);
+                    UString filename;
+                    if (counterRaw == 0)
+                        filename = usprintf("%s/file.ffs", path.toLocal8Bit());
+                    else
+                        filename = usprintf("%s/file_%d.ffs", path.toLocal8Bit(), counterRaw);
+                    counterRaw++;
+                    std::ofstream file(filename.toLocal8Bit(), std::ofstream::binary);
+                    if (!file)
+                        return U_FILE_OPEN;
+                    const UByteArray &headerData = model->header(fileIndex);
+                    const UByteArray &bodyData = model->body(fileIndex);
+                    const UByteArray &tailData = model->tail(fileIndex);
+                    file.write(headerData.constData(), headerData.size());
+                    file.write(bodyData.constData(), bodyData.size());
+                    file.write(tailData.constData(), tailData.size());
 
-                dumped = true;
+                    dumped = true;
+                }
             }
         }
 
diff --git a/UEFIExtract/ffsdumper.h b/UEFIExtract/ffsdumper.h
index c4a3a4c..8b2a7ec 100644
--- a/UEFIExtract/ffsdumper.h
+++ b/UEFIExtract/ffsdumper.h
@@ -14,6 +14,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef FFSDUMPER_H
 #define FFSDUMPER_H
 
+#include <set>
+
 #include "../common/basetypes.h"
 #include "../common/ustring.h"
 #include "../common/treemodel.h"
@@ -47,5 +49,6 @@ private:
     UString currentPath;
     bool dumped;
     int counterHeader, counterBody, counterRaw, counterInfo;
+    std::set<UModelIndex> fileList;
 };
 #endif // FFSDUMPER_H