system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-02 21:33:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

mountmgr: Change scope of variable pvd in VOLUME_GetSuperblockLabel (cppcheck).

Browse source 
The data in pvd was being accessed through the label_ptr variable after
pvd went out of scope.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alex Henrie 2021-12-19 21:54:21 -07:00 committed by Alexandre Julliard
parent 8e081d32bd
commit 656d7f58a1
1 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
dlls/mountmgr.sys/device.c
View file

@ -398,6 +398,7 @@ static void VOLUME_GetSuperblockLabel( struct volume *volume, HANDLE handle, con
{
const BYTE *label_ptr = NULL;
DWORD label_len;
BYTE pvd[BLOCK_SIZE];
switch (volume->fs_type)
{
@ -435,32 +436,28 @@ static void VOLUME_GetSuperblockLabel( struct volume *volume, HANDLE handle, con
break;
}
case FS_UDF:
if(!UDF_Find_PVD(handle, pvd))
{
BYTE pvd[BLOCK_SIZE];
label_len = 0;
break;
}
if(!UDF_Find_PVD(handle, pvd))
{
label_len = 0;
break;
}
/* [E] 3/10.1.4 and [U] 2.1.1 */
if(pvd[24]==8)
{
label_ptr = pvd + 24 + 1;
label_len = pvd[24+32-1];
break;
}
else
{
unsigned int i;
/* [E] 3/10.1.4 and [U] 2.1.1 */
if(pvd[24]==8)
{
label_ptr = pvd + 24 + 1;
label_len = pvd[24+32-1];
break;
}
else
{
unsigned int i;
label_len = 1 + pvd[24+32-1];
for (i = 0; i < label_len; i += 2)
volume->label[i/2] = (pvd[24+1+i] << 8) | pvd[24+1+i+1];
volume->label[label_len] = 0;
return;
}
label_len = 1 + pvd[24+32-1];
for (i = 0; i < label_len; i += 2)
volume->label[i/2] = (pvd[24+1+i] << 8) | pvd[24+1+i+1];
volume->label[label_len] = 0;
return;
}
}
if (label_len) RtlMultiByteToUnicodeN( volume->label, sizeof(volume->label) - sizeof(WCHAR),