Skip to content

Commit a4f8a1c

Browse files
authored
Merge pull request #21 from Lunaretic/master
Added sanity check for AddFileDescriptor failing.
2 parents 1742130 + ba5dc54 commit a4f8a1c

File tree

1 file changed

+14
-4
lines changed
  • xivModdingFramework/SqPack/FileTypes

1 file changed

+14
-4
lines changed

xivModdingFramework/SqPack/FileTypes/Dat.cs

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1254,8 +1254,13 @@ where entry.fullPath.Equals(modEntry.fullPath)
12541254
}
12551255
if (NewFilesNeedToBeAdded)
12561256
{
1257-
index.AddFileDescriptor(internalFilePath, mod.data.modOffset, dataFile);
1258-
index.AddFileDescriptor($"{internalFilePath}.flag", -1, dataFile);
1257+
var success = true;
1258+
success = success && index.AddFileDescriptor(internalFilePath, mod.data.modOffset, dataFile);
1259+
success = success && index.AddFileDescriptor($"{internalFilePath}.flag", -1, dataFile);
1260+
if(!success)
1261+
{
1262+
throw new Exception("Failed to create file descriptor.");
1263+
}
12591264
}
12601265
var originalOffset = await index.UpdateIndex(mod.data.modOffset, internalFilePath, dataFile) * 8;
12611266
await index.UpdateIndex2(mod.data.modOffset, internalFilePath, dataFile);
@@ -1376,8 +1381,13 @@ where entry.fullPath.Equals(modEntry.fullPath)
13761381
var modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(_modListDirectory.FullName));
13771382
if (NewFilesNeedToBeAdded)
13781383
{
1379-
index.AddFileDescriptor(internalFilePath, offset, dataFile);
1380-
index.AddFileDescriptor($"{internalFilePath}.flag", -1, dataFile);
1384+
var success = true;
1385+
success = success && index.AddFileDescriptor(internalFilePath, offset, dataFile);
1386+
success = success && index.AddFileDescriptor($"{internalFilePath}.flag", -1, dataFile);
1387+
if (!success)
1388+
{
1389+
throw new Exception("Failed to create file descriptor.");
1390+
}
13811391
}
13821392
var oldOffset = await index.UpdateIndex(offset, internalFilePath, dataFile) * 8;
13831393
await index.UpdateIndex2(offset, internalFilePath, dataFile);

0 commit comments

Comments
 (0)