Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-11-23 11:35:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow empty dict

Browse Source
This commit is contained in:
jief666 2020-08-19 10:52:07 +03:00
parent 5b1eea4df0
commit 2ef2b9df0d
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rEFIt_UEFI/Platform/Settings.cpp
View File

@ -510,7 +510,7 @@ LoadUserSettings (
{ {
EFI_STATUS Status = EFI_NOT_FOUND; EFI_STATUS Status = EFI_NOT_FOUND;
UINTN Size = 0; UINTN Size = 0;
CHAR8* gConfigPtr = NULL; CHAR8* ConfigPtr = NULL;
XStringW ConfigPlistPath; XStringW ConfigPlistPath;
XStringW ConfigOemPath; XStringW ConfigOemPath;
@ -524,16 +524,16 @@ LoadUserSettings (
ConfigPlistPath = SWPrintf("EFI\\CLOVER\\%ls.plist", ConfName.wc_str()); ConfigPlistPath = SWPrintf("EFI\\CLOVER\\%ls.plist", ConfName.wc_str());
ConfigOemPath = SWPrintf("%ls\\%ls.plist", OEMPath.wc_str(), ConfName.wc_str()); ConfigOemPath = SWPrintf("%ls\\%ls.plist", OEMPath.wc_str(), ConfName.wc_str());
if (FileExists (SelfRootDir, ConfigOemPath)) { if (FileExists (SelfRootDir, ConfigOemPath)) {
Status = egLoadFile(SelfRootDir, ConfigOemPath.wc_str(), (UINT8**)&gConfigPtr, &Size); Status = egLoadFile(SelfRootDir, ConfigOemPath.wc_str(), (UINT8**)&ConfigPtr, &Size);
} }
if (EFI_ERROR(Status)) { if (EFI_ERROR(Status)) {
if ((RootDir != NULL) && FileExists (RootDir, ConfigPlistPath)) { if ((RootDir != NULL) && FileExists (RootDir, ConfigPlistPath)) {
Status = egLoadFile(RootDir, ConfigPlistPath.wc_str(), (UINT8**)&gConfigPtr, &Size); Status = egLoadFile(RootDir, ConfigPlistPath.wc_str(), (UINT8**)&ConfigPtr, &Size);
} }
if (!EFI_ERROR(Status)) { if (!EFI_ERROR(Status)) {
DBG("Using %ls.plist at RootDir at path: %ls\n", ConfName.wc_str(), ConfigPlistPath.wc_str()); DBG("Using %ls.plist at RootDir at path: %ls\n", ConfName.wc_str(), ConfigPlistPath.wc_str());
} else { } else {
Status = egLoadFile(SelfRootDir, ConfigPlistPath.wc_str(), (UINT8**)&gConfigPtr, &Size); Status = egLoadFile(SelfRootDir, ConfigPlistPath.wc_str(), (UINT8**)&ConfigPtr, &Size);
if (!EFI_ERROR(Status)) { if (!EFI_ERROR(Status)) {
DBG("Using %ls.plist at SelfRootDir at path: %ls\n", ConfName.wc_str(), ConfigPlistPath.wc_str()); DBG("Using %ls.plist at SelfRootDir at path: %ls\n", ConfName.wc_str(), ConfigPlistPath.wc_str());
}else{ }else{
@ -544,8 +544,8 @@ LoadUserSettings (
DBG("Using %ls.plist at SelfRootDir at path: %ls\n", ConfName.wc_str(), ConfigOemPath.wc_str()); DBG("Using %ls.plist at SelfRootDir at path: %ls\n", ConfName.wc_str(), ConfigOemPath.wc_str());
} }
if (!EFI_ERROR(Status) && gConfigPtr != NULL) { if (!EFI_ERROR(Status) && ConfigPtr != NULL) {
Status = ParseXML((const CHAR8*)gConfigPtr, Dict, (UINT32)Size); Status = ParseXML((const CHAR8*)ConfigPtr, Dict, (UINT32)Size);
if (EFI_ERROR(Status)) { if (EFI_ERROR(Status)) {
// Dict = NULL; // Dict = NULL;
DBG("config.plist parse error Status=%s\n", strerror(Status)); DBG("config.plist parse error Status=%s\n", strerror(Status));

9
rEFIt_UEFI/Platform/plist.h
View File

@ -116,7 +116,7 @@ public:
} }
void setDataValue(UINT8* data, UINTN dataLen) void setDataValue(UINT8* data, UINTN dataLen)
{ {
if ( data == NULL ) panic("TagStruct::setDictValue() : _data == NULL "); if ( data == NULL ) panic("TagStruct::setDataValue() : _data == NULL ");
_data = data; _data = data;
_dataLen = dataLen; _dataLen = dataLen;
type = kTagTypeData; type = kTagTypeData;
@ -141,9 +141,10 @@ public:
} }
void setDictTagValue(TagStruct* tagList) void setDictTagValue(TagStruct* tagList)
{ {
if ( tagList == NULL ) panic("TagStruct::setDictValue() : tagList == NULL "); // empty dict is allowed
if ( _tag != NULL ) panic("TagStruct::setDictValue() : _tag != NULL "); //if ( tagList == NULL ) panic("TagStruct::setDictTagValue() : tagList == NULL ");
if ( _nextTag != NULL ) panic("TagStruct::setDictValue() : _nextTag != NULL "); if ( _tag != NULL ) panic("TagStruct::setDictTagValue() : _tag != NULL ");
if ( _nextTag != NULL ) panic("TagStruct::setDictTagValue() : _nextTag != NULL ");
_tag = tagList; _tag = tagList;
_nextTag = NULL; _nextTag = NULL;
type = kTagTypeDict; type = kTagTypeDict;