Skip to content

audition/cool_wv4.c: bounds-check cue/plst/ltxt special data sizes #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aizu-m wants to merge 1 commit into
base: master
Choose a base branch
from
Open

audition/cool_wv4.c: bounds-check cue/plst/ltxt special data sizes #238

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 35 additions & 8 deletions audition/cool_wv4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1368,10 +1368,19 @@ DWORD PASCAL FilterGetNextSpecialData (HANDLE hInput, SPECIALDATA *psp)
}

if (!strncmp (ChunkHeader.ckID, "cue ", 4)) {
int num_cues = (psp->dwExtra = * (DWORD *) pData);
int num_cues = psp->dwSize >= sizeof (DWORD) ? (psp->dwExtra = * (DWORD *) pData) : -1;
struct cue_type *pCue = (struct cue_type *)(pData + sizeof (DWORD));
HANDLE hxData = GlobalAlloc (GMEM_MOVEABLE | GMEM_ZEROINIT, num_cues * 8);
DWORD *pdwData = (DWORD *) GlobalLock (hxData);
HANDLE hxData;
DWORD *pdwData;

if (num_cues < 0 || (DWORD) num_cues > (psp->dwSize - sizeof (DWORD)) / sizeof (struct cue_type)) {
GlobalUnlock (pData);
GlobalFree (psp->hData);
return 0;
}

hxData = GlobalAlloc (GMEM_MOVEABLE | GMEM_ZEROINIT, num_cues * 8);
pdwData = (DWORD *) GlobalLock (hxData);

while (num_cues--) {
*pdwData++ = pCue->dwName;
Expand All @@ -1386,10 +1395,19 @@ DWORD PASCAL FilterGetNextSpecialData (HANDLE hInput, SPECIALDATA *psp)
return 1;
}
else if (!strncmp (ChunkHeader.ckID, "plst", 4)) {
int num_plays = (psp->dwExtra = * (DWORD *) pData);
int num_plays = psp->dwSize >= sizeof (DWORD) ? (psp->dwExtra = * (DWORD *) pData) : -1;
struct play_type *pCue = (struct play_type *)(pData + sizeof (DWORD));
HANDLE hxData = GlobalAlloc (GMEM_MOVEABLE | GMEM_ZEROINIT, num_plays * 16);
DWORD *pdwData = (DWORD *) GlobalLock (hxData);
HANDLE hxData;
DWORD *pdwData;

if (num_plays < 0 || (DWORD) num_plays > (psp->dwSize - sizeof (DWORD)) / sizeof (struct play_type)) {
GlobalUnlock (pData);
GlobalFree (psp->hData);
return 0;
}

hxData = GlobalAlloc (GMEM_MOVEABLE | GMEM_ZEROINIT, num_plays * 16);
pdwData = (DWORD *) GlobalLock (hxData);

while (num_plays--) {
*pdwData++ = pCue->dwName;
Expand All @@ -1406,8 +1424,17 @@ DWORD PASCAL FilterGetNextSpecialData (HANDLE hInput, SPECIALDATA *psp)
return 1;
}
else if (!strncmp (ChunkHeader.ckID, "ltxt", 4)) {
HANDLE hxData = GlobalAlloc (GMEM_MOVEABLE | GMEM_ZEROINIT, psp->dwSize - 4);
char *pxData = GlobalLock (hxData);
HANDLE hxData;
char *pxData;

if (psp->dwSize < 20) {
GlobalUnlock (pData);
GlobalFree (psp->hData);
return 0;
}

hxData = GlobalAlloc (GMEM_MOVEABLE | GMEM_ZEROINIT, psp->dwSize - 4);
pxData = GlobalLock (hxData);

memset (pxData, 0, psp->dwSize - 4);
* (DWORD *) pxData = psp->dwSize - 4;
Expand Down
Loading