Merge branch 'master' into dtdocbook

2022-01-30 08:04:32 +08:00
parent 20e32a1208 75c377065a
commit b4ffb694bd
285 changed files with 778 additions and 838 deletions
--- a/cde/lib/DtHelp/FormatSDL.c
+++ b/cde/lib/DtHelp/FormatSDL.c
@@ -5089,11 +5089,11 @@ ProcessSDLAttribute(
    char	*attrValue;
    char	**strPtr;
    char	 numBuf[DTD_NAMELEN+1];
-    char	*varOffset1;
+    char	*varOffset1 = NULL;
    SDLNumber   *numPtr1;
    SdlOption   *enumPtr1;
    SdlOption	 attrNum;
-    _DtHelpFontValue	 fontNum;
+    _DtHelpFontValue	 fontNum = 0;
    _DtHelpFontValue	*fontPtr1;
    const SDLAttribute *pAttr = SDLAttributeList;