diff --git a/rEFIt_UEFI/Platform/plist/TagArray.cpp b/rEFIt_UEFI/Platform/plist/TagArray.cpp index 25a96e018..ea96e1846 100755 --- a/rEFIt_UEFI/Platform/plist/TagArray.cpp +++ b/rEFIt_UEFI/Platform/plist/TagArray.cpp @@ -126,7 +126,7 @@ const TagDict* TagArray::dictElementAt(size_t idx, const XString8& currentTag) c { const TagStruct* tag = elementAt(idx); if ( !tag->isDict() ) { - MsgLog("MALFORMED PLIST in '%s' : TagArray::dictElementAt(%zu) -> trying to get a dict element at %zu, but element is %s\n", currentTag.c_str(), idx, idx, tag->getTypeAsXString8().c_str()); + panic("MALFORMED PLIST in '%s' : TagArray::dictElementAt(%zu) -> trying to get a dict element at %zu, but element is %s\n", currentTag.c_str(), idx, idx, tag->getTypeAsXString8().c_str()); } return _arrayContent[idx].getDict(); } @@ -135,7 +135,7 @@ const TagArray* TagArray::arrayElementAt(size_t idx, const XString8& currentTag) { const TagStruct* tag = elementAt(idx); if ( !tag->isArray() ) { - MsgLog("MALFORMED PLIST in '%s' : TagArray::dictElementAt(%zu) -> trying to get a array element at %zu, but element is %s\n", currentTag.c_str(), idx, idx, tag->getTypeAsXString8().c_str()); + panic("MALFORMED PLIST in '%s' : TagArray::dictElementAt(%zu) -> trying to get a array element at %zu, but element is %s\n", currentTag.c_str(), idx, idx, tag->getTypeAsXString8().c_str()); } return _arrayContent[idx].getArray(); } @@ -144,7 +144,7 @@ const TagDict* TagArray::dictElementAt(size_t idx) const { const TagStruct* tag = elementAt(idx); if ( !tag->isDict() ) { - MsgLog("MALFORMED PLIST : TagArray::dictElementAt(%zu) -> trying to get a dict element at %zu, but element is %s\n", idx, idx, tag->getTypeAsXString8().c_str()); + panic("MALFORMED PLIST : TagArray::dictElementAt(%zu) -> trying to get a dict element at %zu, but element is %s\n", idx, idx, tag->getTypeAsXString8().c_str()); } return _arrayContent[idx].getDict(); } @@ -153,7 +153,7 @@ const TagArray* TagArray::arrayElementAt(size_t idx) const { const TagStruct* tag = elementAt(idx); if ( !tag->isArray() ) { - MsgLog("MALFORMED PLIST : TagArray::dictElementAt(%zu) -> trying to get a array element at %zu, but element is %s\n", idx, idx, tag->getTypeAsXString8().c_str()); + panic("MALFORMED PLIST : TagArray::dictElementAt(%zu) -> trying to get a array element at %zu, but element is %s\n", idx, idx, tag->getTypeAsXString8().c_str()); } return _arrayContent[idx].getArray(); } diff --git a/rEFIt_UEFI/Platform/plist/TagDict.cpp b/rEFIt_UEFI/Platform/plist/TagDict.cpp index b1ec2e640..49e398c95 100755 --- a/rEFIt_UEFI/Platform/plist/TagDict.cpp +++ b/rEFIt_UEFI/Platform/plist/TagDict.cpp @@ -167,8 +167,7 @@ const TagDict* TagDict::dictPropertyForKey(const CHAR8* key) const const TagStruct* tag = propertyForKey(key); if ( tag == NULL ) return NULL; if ( !tag->isDict() ) { - MsgLog("MALFORMED PLIST : Property value for key %s must be a dict\n", key); - return NULL; + panic("MALFORMED PLIST : Property value for key %s must be a dict\n", key); } return tag->getDict(); } @@ -178,8 +177,7 @@ const TagArray* TagDict::arrayPropertyForKey(const CHAR8* key) const const TagStruct* tag = propertyForKey(key); if ( tag == NULL ) return NULL; if ( !tag->isArray() ) { - MsgLog("MALFORMED PLIST : Property value for key %s must be an array\n", key); - return NULL; + panic("MALFORMED PLIST : Property value for key %s must be an array\n", key); } return tag->getArray(); }