cmclark00/retro-imager
1
0
Fork 0
mirror of https://github.com/cmclark00/retro-imager.git synced 2025-05-18 07:55:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

FAT editing: handle root directory without end-of-dir marker

Browse source 
Fixes customizing Homebridge image.
This commit is contained in:
Floris Bos 2023-03-22 17:54:22 +01:00
parent 65f6a07fae
commit 43911005a2
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/devicewrapperfatpartition.cpp
View file

@ -1,5 +1,6 @@
#include "devicewrapperfatpartition.h" #include "devicewrapperfatpartition.h"
#include "devicewrapperstructs.h" #include "devicewrapperstructs.h"
#include <QDebug>
/* /*
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
@ -383,7 +384,8 @@ bool DeviceWrapperFatPartition::getDirEntry(const QString &longFilename, struct
{ {
if (entry->DIR_Name[0] != 0xE5) if (entry->DIR_Name[0] != 0xE5)
{ {
filenameRead.truncate(filenameRead.indexOf(QChar::Null)); if (filenameRead.indexOf(QChar::Null))
filenameRead.truncate(filenameRead.indexOf(QChar::Null));
//qDebug() << "Long filename:" << filenameRead << "DIR_Name:" << QByteArray((char *) entry->DIR_Name, sizeof(entry->DIR_Name)) << "Short:" << _dirEntryToShortName(entry); //qDebug() << "Long filename:" << filenameRead << "DIR_Name:" << QByteArray((char *) entry->DIR_Name, sizeof(entry->DIR_Name)) << "Short:" << _dirEntryToShortName(entry);
@ -599,7 +601,13 @@ bool DeviceWrapperFatPartition::readDir(struct dir_entry *result)
uint32_t nextCluster = getFAT(_fat32_currentRootDirCluster); uint32_t nextCluster = getFAT(_fat32_currentRootDirCluster);
if (nextCluster > 0xFFFFFF7) if (nextCluster > 0xFFFFFF7)
throw std::runtime_error("Reached end of FAT32 root directory, but no end-of-directory marker found"); {
qDebug() << "Reached end of FAT32 root directory, but no end-of-directory marker found. Adding one in new cluster.";
nextCluster = allocateCluster(_fat32_currentRootDirCluster);
seekCluster(nextCluster);
QByteArray zeroes(_bytesPerCluster, 0);
write(zeroes.data(), zeroes.length() );
}
if (_currentDirClusters.contains(nextCluster)) if (_currentDirClusters.contains(nextCluster))
throw std::runtime_error("Circular cluster references in FAT32 directory detected"); throw std::runtime_error("Circular cluster references in FAT32 directory detected");