Changeset 10173 for trunk/src/winmm/waveout.cpp

Timestamp:

Jul 16, 2003, 5:47:24 PM (22 years ago)

Author:

sandervl

Message:

KOM: fixed potential buffer overflows in *GetErrorString functions

File:

• trunk/src/winmm/waveout.cpp (modified) (6 diffs)

trunk/src/winmm/waveout.cpp

@@ -1 @@
-/* $Id: waveout.cpp,v 1.26 2003-03-06 15:42:33 sandervl Exp $ */
+/* $Id: waveout.cpp,v 1.27 2003-07-16 15:47:24 sandervl Exp $ */
 //#undef DEBUG
 /*
@@ -39 +39 @@
 /******************************************************************************/
 /******************************************************************************/
-MMRESULT WINAPI waveOutOpen(LPHWAVEOUT phwo, UINT uDeviceID, const LPWAVEFORMATEX pwfx, 
+MMRESULT WINAPI waveOutOpen(LPHWAVEOUT phwo, UINT uDeviceID, const LPWAVEFORMATEX pwfx,
                             DWORD dwCallback, DWORD dwInstance, DWORD fdwOpen)
 {
@@ -49 +49 @@
         return(WAVERR_BADFORMAT);
 
-    if(fdwOpen & WAVE_FORMAT_QUERY) 
+    if(fdwOpen & WAVE_FORMAT_QUERY)
     {
         if(DartWaveOut::queryFormat(pwfx->wFormatTag, pwfx->nChannels, pwfx->nSamplesPerSec,
@@ -332 +332 @@
     char * theMsg = getWinmmMsg( wError );
     if(theMsg) {
-        AsciiToUnicode( theMsg, lpText );
+        AsciiToUnicodeN( theMsg, lpText, cchText );
     }
     else
@@ -338 +338 @@
         char errMsg[100];
         sprintf( errMsg, "Unknown error number %d", wError );
-        AsciiToUnicode( errMsg, lpText );
+        AsciiToUnicodeN( errMsg, lpText, cchText );
     }
     return MMSYSERR_NOERROR;
@@ -419 +419 @@
 {
     WaveOut *dwave = (WaveOut *)hwo;
-    
+
     dprintf(("waveOutSetPlaybackRate: NOT IMPLEMENTED!!"));
     if(WaveOut::find(dwave) == TRUE)