Changeset 57 for trunk/classes/c

Timestamp:

May 11, 2023, 10:44:53 PM (2 years ago)

Author:

gyoung

Message:

Fix errors reported by CPPCheck

Location:

trunk/classes/c

Files:

• c_audio/cwastream.c (modified) (1 diff)
• c_common/helper.c (modified) (2 diffs)
• c_image/cwbmp.c (modified) (2 diffs)
• c_mm/cwmmdisk.c (modified) (1 diff)
• c_mm/mmfolder.c (modified) (1 diff)

trunk/classes/c/c_audio/cwastream.c

@@ -75 +75 @@
       
       if(!fgets(chrBuf, ulBufSize, fStream)) {
-        fclose(fStream);
+        // Fixme double deallocation is this missing a break;
+        //fclose(fStream);
         sprintf(chrBuf, DEFAULT_AUDIOSTREAM_SERVER);
       }

trunk/classes/c/c_common/helper.c

@@ -62 +62 @@
   HAPP         happ;
   HWND hwndAppTerminateHandler;
-  char startupDir[CCHMAXPATH];
+  char startupDir[CCHMAXPATH] = {0};
   char *chrPtr;
 
@@ -73 +73 @@
   pDetails.pszParameters   = parameters;
   /* Set the startup directory to the location of the executable */
-  strncpy(startupDir, wrapperExe, sizeof(startupDir));
+  strncpy(startupDir, wrapperExe, sizeof(startupDir) - 1);
   //  SysWriteToTrapLog("1: %s %s\n", startupDir, wrapperExe);
   if((chrPtr=strrchr(startupDir,'\\'))!=NULLHANDLE) {

trunk/classes/c/c_image/cwbmp.c

@@ -706 +706 @@
     if(ppDetailsData)
       {
-        ULONG ulWidth, ulHeight, ulDepth;
+        ULONG ulWidth = 0, ulHeight = 0, ulDepth = 0;
         PBITMAPINFOHEADER2 pBmpInfoHeader2;       
         
@@ -725 +725 @@
         }
         
-        /* Fill the structure with the info to be displayed */      
+        /* Fill the structure with the info to be displayed */
+        // Fixme ulWidth and freinds are potentally uninitulized is the } above in the wrong place
         pImageDetails=(PIMAGEDETAILS)*ppDetailsData;  
         pImageDetails->ulWidth=ulWidth;

trunk/classes/c/c_mm/cwmmdisk.c

@@ -97 +97 @@
                 if((hObject=WinQueryObject(chrPlayerID))!=NULLHANDLE) {
                   WPObject *wpObject;
-                  HWND hwnd;
+                  HWND hwnd = 0;
                   wpObject=_wpclsQueryObject( _CWMMDisk , hObject);
                   if(somIsObj(wpObject)) {

trunk/classes/c/c_mm/mmfolder.c

@@ -358 +358 @@
               if((somIsObj(cwImageClass)||somIsObj(cwBitmapClass)) && !(_wpQueryStyle(wpObject) & OBJSTYLE_TEMPLATE)) {
                 HBITMAP hbm=NULLHANDLE;
-                PBITMAPINFOHEADER2 pBmpInfoHeader2;
+                PBITMAPINFOHEADER2 pBmpInfoHeader2=NULLHANDLE;
 #ifdef DEBUG
                 SysWriteToTrapLog("Object is an image. (%s line: %d)\n", __FUNCTION__, __LINE__);