Changeset 57 for trunk/mediafolder/c

Timestamp:

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

Author:

gyoung

Message:

Fix errors reported by CPPCheck

Location:

trunk/mediafolder/c

Files:

• cddb/cddbcls.cpp (modified) (1 diff)
• helper/cddbhelper.cpp (modified) (2 diffs)
• helper/launchpad.cpp (modified) (3 diffs)
• mediafldr/mediafolder.cpp (modified) (2 diffs)

trunk/mediafolder/c/cddb/cddbcls.cpp

@@ -146 +146 @@
 void printError(char* errorString)
 {
-  char buffer[CCHMAXPATH];
+    char buffer[CCHMAXPATH] = {0};
   char *ptr;
 
-  strncpy(buffer, errorString, sizeof(buffer));
+  strncpy(buffer, errorString, sizeof(buffer) - 1);
   fprintf(stderr,"%s",errorString);
   /* hwndError is global, so this isn't threadsafe */

trunk/mediafolder/c/helper/cddbhelper.cpp

@@ -40 +40 @@
 void extern printError(char* errorString)
 {
-  char buffer[CCHMAXPATH];
+    char buffer[CCHMAXPATH] = {0};
   char *ptr;
 
@@ -47 +47 @@
   writeLog(errorString);
   if(hwndError) {
-    strncpy(buffer, errorString, sizeof(buffer));
+    strncpy(buffer, errorString, sizeof(buffer) - 1);
     ptr=strchr(buffer,'\n');
     if(ptr) {

trunk/mediafolder/c/helper/launchpad.cpp

@@ -557 +557 @@
         static HWND hwndBubbleClient;
         ULONG style=FCF_BORDER|FCF_NOBYTEALIGN;
-        char winText[255];
+        char winText[255] = {0};
         
         /* Get window text for size calculating */
@@ -1028 +1028 @@
     if(somIsObj(folderClass))
       wpFolder=(WPFolder*)((M_WPFolder*)folderClass)->wpclsQueryFolder(chrConfigID, FALSE);
-  }
-
+    if(!somIsObj(wpFolder))
+      return FALSE;
+  }
+  else
+    return FALSE;
+
+  // Fixme see line 1106
   ulBufferSize=sizeof(chrPath);
   wpFolder->wpQueryRealName(chrPath, &ulBufferSize, TRUE);
@@ -1101 +1106 @@
       return FALSE;
   }
-  
+  else
+    return FALSE;
+  // Fixme wpFolder can be uninittailized if(somIsObj(wpParentFolder)) is false sould we return FALSE
   /* Build ini name */
   ulBufferSize=sizeof(chrPath);

trunk/mediafolder/c/mediafldr/mediafolder.cpp

@@ -867 +867 @@
 static int _getRandomTrack(  MEDIAFLDRDATA* mfData)
 {
-  int zufall;
+  int zufall = 0;
   DATETIME DT;
   INT  seed, start,  iCheck=0;
@@ -928 +928 @@
   ULONG rc;
   int iWavePriv;
-  int iTime2;
+  int iTime2 = 0;
   HWND hwndNotify;
   BOOL notFound;