Changeset 142

Timestamp:

Jan 21, 2024, 10:17:50 PM (20 months ago)

Author:

gyoung

Message:

Fix warnings and error found by C++Check

Location:

trunk

Files:

• classes/mm-progs/mmfind/mmfind.c (modified) (1 diff)
• classes/mm-progs/videoplayer/mmplayer.c (modified) (1 diff)
• classes/mm-progs/videoplayer/playaudio.c (modified) (1 diff)
• classes/mm-progs/videoplayer/vioplayer.c (modified) (1 diff)
• mediafolder/c/cddb/pmcddb.cpp (modified) (1 diff)
• mediafolder/c/cdfldr/cdfolderoverriddenwpmethods.cpp (modified) (1 diff)
• mediafolder/c/createcd/createcd.c (modified) (1 diff)
• mediafolder/c/mediafldr/mediafolder.cpp (modified) (2 diffs)

trunk/classes/mm-progs/mmfind/mmfind.c

@@ -315 +315 @@
 
   if(bIsMidi)
-    strncpy(chrDevice,"SEQUENCER", sizeof(chrDevice));
+    strncpy(chrDevice,"SEQUENCER", sizeof(chrDevice) - 1);
   else
-    strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice));
+    strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice) - 1);
 
   /* Start audio file */

trunk/classes/mm-progs/videoplayer/mmplayer.c

@@ -159 +159 @@
 
 /* Track to play. Full path */
-char chrSourceName[CCHMAXPATH]={0};
+char chrSourceName[CCHMAXPATH + 1]={0};
 char * chrPtrName=NULLHANDLE; /* Pointer to filename */
 char chrClassName[100]= {0};

trunk/classes/mm-progs/videoplayer/playaudio.c

@@ -158 +158 @@
     strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice));
 #endif
-  strncpy(chrDevice,"DIGITALVIDEO02", sizeof(chrDevice));
+  strncpy(chrDevice,"DIGITALVIDEO02", sizeof(chrDevice) - 1);
   //  strncpy(chrDevice,"xine", sizeof(chrDevice));
   hwndNotify=hwndFrame;//WinWindowFromID(hwndTop, IDDLG_TOPMIDDLE);

trunk/classes/mm-progs/videoplayer/vioplayer.c

@@ -231 +231 @@
   /* Save source name */
   if(argc==2)
-    strcpy(chrSourceName, argv[1]);
+    strncpy(chrSourceName, argv[1], CCHMAXPATH);
   printf("File: %s\n", chrSourceName);
 

trunk/mediafolder/c/cddb/pmcddb.cpp

@@ -341 +341 @@
 
   for(b=0;b<NUMSERVERS;b++) {/* Query the whole list of servers if necessary */
-    strncpy(host,cddbServer[b],sizeof(host));
+    strncpy(host,cddbServer[b],sizeof(host) - 1);
     chrPtr=strrchr(host,':');
     if(chrPtr) {

trunk/mediafolder/c/cdfldr/cdfolderoverriddenwpmethods.cpp

@@ -457 +457 @@
     // }
 
-  strncpy(chrDevice,"CDAUDIO", sizeof(chrDevice));
+  strncpy(chrDevice,"CDAUDIO", sizeof(chrDevice) - 1);
 
   PSZ pszObjectID;

trunk/mediafolder/c/createcd/createcd.c

@@ -323 +323 @@
 
   if(!getMessage(nameTemplate, /* IDSTR_LAUNCHPADFLYOVER */ IDSTR_CDFOLDERNAME, sizeof(nameTemplate), hmodRes))
-    strncpy(nameTemplate, "CD-Audio player^Drive %c:", sizeof(nameTemplate));
+    strncpy(nameTemplate, "CD-Audio player^Drive %c:", sizeof(nameTemplate) - 1);
 
   if(!loadLVMFuncs()) {

trunk/mediafolder/c/mediafldr/mediafolder.cpp

@@ -768 +768 @@
 
   if(contentObject->somIsA(mmMIDIClass))
-    strncpy(chrDevice,"SEQUENCER", sizeof(chrDevice));
+    strncpy(chrDevice,"SEQUENCER", sizeof(chrDevice) - 1);
   else /*if(contentObject->somIsA(cwAudioClass) || contentObject->somIsA(mmAudioClass))*/
     strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice));
@@ -1080 +1080 @@
 
   if(contentObject->somIsA(mmMIDIClass))
-    strncpy(chrDevice,"SEQUENCER", sizeof(chrDevice));
+    strncpy(chrDevice,"SEQUENCER", sizeof(chrDevice) - 1);
   else /*if(contentObject->somIsA(cwAudioClass) || contentObject->somIsA(mmAudioClass))*/
     strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice));