git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7303
6f19259b-4bc3-4df7-8a09-
765794883524
MultiStringSize + AppendStringSize,\r
(VOID *) (*MultiString)\r
);\r
MultiStringSize + AppendStringSize,\r
(VOID *) (*MultiString)\r
);\r
+ ASSERT (*MultiString != NULL);\r
//\r
// Append the incoming string\r
//\r
//\r
// Append the incoming string\r
//\r
- if (StringPackage->StringBlock != NULL) {\r
- FreePool (StringPackage->StringBlock);\r
- }\r
- if (StringPackage->StringPkgHdr != NULL) {\r
- FreePool (StringPackage->StringPkgHdr);\r
- }\r
if (StringPackage != NULL) {\r
if (StringPackage != NULL) {\r
+ if (StringPackage->StringBlock != NULL) {\r
+ FreePool (StringPackage->StringBlock);\r
+ }\r
+ if (StringPackage->StringPkgHdr != NULL) {\r
+ FreePool (StringPackage->StringPkgHdr);\r
+ }\r
FreePool (StringPackage);\r
}\r
return Status;\r
FreePool (StringPackage);\r
}\r
return Status;\r
if (FontInfo != NULL) {\r
FreePool (FontInfo);\r
}\r
if (FontInfo != NULL) {\r
FreePool (FontInfo);\r
}\r
- if (FontPackage->GlyphBlock != NULL) {\r
- FreePool (FontPackage->GlyphBlock);\r
- }\r
if (FontPackage != NULL) {\r
if (FontPackage != NULL) {\r
+ if (FontPackage->GlyphBlock != NULL) {\r
+ FreePool (FontPackage->GlyphBlock);\r
+ }\r
FreePool (FontPackage);\r
}\r
if (GlobalFont != NULL) {\r
FreePool (FontPackage);\r
}\r
if (GlobalFont != NULL) {\r
- if (SimpleFontPackage->SimpleFontPkgHdr != NULL) {\r
- FreePool (SimpleFontPackage->SimpleFontPkgHdr);\r
- }\r
if (SimpleFontPackage != NULL) {\r
if (SimpleFontPackage != NULL) {\r
+ if (SimpleFontPackage->SimpleFontPkgHdr != NULL) {\r
+ FreePool (SimpleFontPackage->SimpleFontPkgHdr);\r
+ }\r
FreePool (SimpleFontPackage);\r
}\r
return Status;\r
FreePool (SimpleFontPackage);\r
}\r
return Status;\r
- if (KeyboardLayoutPackage->KeyboardPkg != NULL) {\r
- FreePool (KeyboardLayoutPackage->KeyboardPkg);\r
- }\r
if (KeyboardLayoutPackage != NULL) {\r
if (KeyboardLayoutPackage != NULL) {\r
+ if (KeyboardLayoutPackage->KeyboardPkg != NULL) {\r
+ FreePool (KeyboardLayoutPackage->KeyboardPkg);\r
+ }\r
FreePool (KeyboardLayoutPackage);\r
}\r
\r
FreePool (KeyboardLayoutPackage);\r
}\r
\r