DevKit7/libctru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #90 from lioncash/null

Browse Source 
Guard against potential null pointer dereferences
This commit is contained in:
Dave Murphy 2015-02-01 13:21:27 +00:00
commit 3bed83720f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libctru/source/services/csnd.c
View File

@ -410,7 +410,7 @@ Result csndPlaySound(int chn, u32 flags, u32 sampleRate, void* data0, void* data
if (data0) paddr0 = osConvertVirtToPhys((u32)data0); if (data0) paddr0 = osConvertVirtToPhys((u32)data0);
if (data1) paddr1 = osConvertVirtToPhys((u32)data1); if (data1) paddr1 = osConvertVirtToPhys((u32)data1);
if (encoding == CSND_ENCODING_ADPCM) if (data0 && encoding == CSND_ENCODING_ADPCM)
{ {
int adpcmSample = ((s16*)data0)[-2]; int adpcmSample = ((s16*)data0)[-2];
int adpcmIndex = ((u8*)data0)[-2]; int adpcmIndex = ((u8*)data0)[-2];

3
libctru/source/services/soc/soc_ioctl.c
View File

@ -18,7 +18,8 @@ int ioctl(int fd, int request, ...)
value = va_arg(ap, int*); value = va_arg(ap, int*);
if(value == NULL) { if(value == NULL) {
errno = EFAULT; errno = EFAULT;
ret = -1; va_end(ap);
return -1;
} }
flags = fcntl(fd, F_GETFL, 0); flags = fcntl(fd, F_GETFL, 0);