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

Fix cmdbuf->bool conversion

Browse Source 
Affected code was previously reading 3 uninitialized bytes, making the
conversion return wrong results.
This commit is contained in:
TuxSH 2024-09-07 19:41:47 +02:00
parent faf5162b60
commit c5ecf54d51
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libctru/source/services/fspxi.c
View File

@ -376,7 +376,7 @@ Result FSPXI_HasFile(Handle serviceHandle, FSPXI_Archive archive, bool* out, FS_
if(R_FAILED(ret = svcSendSyncRequest(serviceHandle))) return ret; if(R_FAILED(ret = svcSendSyncRequest(serviceHandle))) return ret;
if (out) *out = (bool)cmdbuf[2]; if (out) *out = (bool)(cmdbuf[2] & 1);
return (Result) cmdbuf[1]; return (Result) cmdbuf[1];
} }
@ -396,7 +396,7 @@ Result FSPXI_HasDirectory(Handle serviceHandle, FSPXI_Archive archive, bool* out
if(R_FAILED(ret = svcSendSyncRequest(serviceHandle))) return ret; if(R_FAILED(ret = svcSendSyncRequest(serviceHandle))) return ret;
if (out) *out = (bool)cmdbuf[2]; if (out) *out = (bool)(cmdbuf[2] & 1);
return (Result) cmdbuf[1]; return (Result) cmdbuf[1];
} }
@ -441,7 +441,7 @@ Result FSPXI_Unknown0x17(Handle serviceHandle, FSPXI_Archive archive, bool* out)
if(R_FAILED(ret = svcSendSyncRequest(serviceHandle))) return ret; if(R_FAILED(ret = svcSendSyncRequest(serviceHandle))) return ret;
if (out) *out = (bool)cmdbuf[2]; if (out) *out = (bool)(cmdbuf[2] & 1);
return (Result) cmdbuf[1]; return (Result) cmdbuf[1];
} }
@ -523,7 +523,7 @@ Result FSPXI_IsSdmcDetected(Handle serviceHandle, bool* out)
if(R_FAILED(ret = svcSendSyncRequest(serviceHandle))) return ret; if(R_FAILED(ret = svcSendSyncRequest(serviceHandle))) return ret;
if(out) *out = (bool)cmdbuf[2]; if(out) *out = (bool)(cmdbuf[2] & 1);
return (Result) cmdbuf[1]; return (Result) cmdbuf[1];
} }
@ -537,7 +537,7 @@ Result FSPXI_IsSdmcWritable(Handle serviceHandle, bool* out)
if(R_FAILED(ret = svcSendSyncRequest(serviceHandle))) return ret; if(R_FAILED(ret = svcSendSyncRequest(serviceHandle))) return ret;
if(out) *out = (bool)cmdbuf[2]; if(out) *out = (bool)(cmdbuf[2] & 1);
return (Result) cmdbuf[1]; return (Result) cmdbuf[1];
} }
@ -663,7 +663,7 @@ Result FSPXI_CardSlotIsInserted(Handle serviceHandle, bool* inserted)
if(R_FAILED(ret = svcSendSyncRequest(serviceHandle))) return ret; if(R_FAILED(ret = svcSendSyncRequest(serviceHandle))) return ret;
if(inserted) *inserted = (bool)cmdbuf[2]; if(inserted) *inserted = (bool)(cmdbuf[2] & 1);
return (Result) cmdbuf[1]; return (Result) cmdbuf[1];
} }
@ -677,7 +677,7 @@ Result FSPXI_CardSlotPowerOn(Handle serviceHandle, bool* status)
if(R_FAILED(ret = svcSendSyncRequest(serviceHandle))) return ret; if(R_FAILED(ret = svcSendSyncRequest(serviceHandle))) return ret;
if(status) *status = (bool)cmdbuf[2]; if(status) *status = (bool)(cmdbuf[2] & 1);
return (Result) cmdbuf[1]; return (Result) cmdbuf[1];
} }
@ -691,7 +691,7 @@ Result FSPXI_CardSlotPowerOff(Handle serviceHandle, bool* status)
if(R_FAILED(ret = svcSendSyncRequest(serviceHandle))) return ret; if(R_FAILED(ret = svcSendSyncRequest(serviceHandle))) return ret;
if(status) *status = (bool)cmdbuf[2]; if(status) *status = (bool)(cmdbuf[2] & 1);
return (Result) cmdbuf[1]; return (Result) cmdbuf[1];
} }
@ -705,7 +705,7 @@ Result FSPXI_CardSlotGetCardIFPowerStatus(Handle serviceHandle, bool* status)
if(R_FAILED(ret = svcSendSyncRequest(serviceHandle))) return ret; if(R_FAILED(ret = svcSendSyncRequest(serviceHandle))) return ret;
if(status) *status = (bool)cmdbuf[2]; if(status) *status = (bool)(cmdbuf[2] & 1);
return (Result) cmdbuf[1]; return (Result) cmdbuf[1];
} }

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

@ -105,7 +105,7 @@ Result PTMSYSM_CheckNew3DS(bool *out)
cmdbuf[0] = IPC_MakeHeader(0x040A,0,0); // 0x040A0000 cmdbuf[0] = IPC_MakeHeader(0x040A,0,0); // 0x040A0000
if(R_FAILED(ret = svcSendSyncRequest(ptmSysmHandle)))return ret; if(R_FAILED(ret = svcSendSyncRequest(ptmSysmHandle)))return ret;
*out = (bool)cmdbuf[2]; // if cmdbuf[1] is != 0 then this is uninitialized (this is fine) *out = (bool)(cmdbuf[2] & 1); // if cmdbuf[1] is != 0 then this is uninitialized (this is fine)
return (Result)cmdbuf[1]; return (Result)cmdbuf[1];
} }