ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(task_patch.c) Cleanups

This commit is contained in:
twinaphex 2020-01-20 04:44:45 +01:00
parent 481f31fe8f
commit 60faeffde0
1 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
tasks/task_patch.c
View File

@ -133,11 +133,11 @@ static enum patch_error bps_apply_patch(
uint8_t **target_data, uint64_t *target_length)
{
size_t i;
uint32_t checksum;
size_t modify_source_size;
size_t modify_target_size;
size_t modify_markup_size;
struct bps_data bps;
uint32_t checksum = 0;
size_t modify_source_size = 0;
size_t modify_target_size = 0;
size_t modify_markup_size = 0;
uint32_t modify_source_checksum = 0;
uint32_t modify_target_checksum = 0;
uint32_t modify_modify_checksum = 0;
@ -176,15 +176,18 @@ static enum patch_error bps_apply_patch(
if (modify_source_size > bps.source_length)
return PATCH_SOURCE_TOO_SMALL;
if (modify_target_size > bps.target_length){
if (modify_target_size > bps.target_length)
{
uint8_t *prov=(uint8_t*)malloc((size_t)modify_target_size);
if (prov!=NULL){
if (!prov)
return PATCH_TARGET_ALLOC_FAILED;
free(*target_data);
bps.target_data = prov;
*target_data = prov;
bps.target_length = modify_target_size;
}else
return PATCH_TARGET_ALLOC_FAILED;
}
while (bps.modify_offset < bps.modify_length - 12)
@ -364,14 +367,14 @@ static enum patch_error ups_apply_patch(
*targetlength = (data.source_length == source_read_length ?
target_read_length : source_read_length);
if (data.target_length < *targetlength){
if (data.target_length < *targetlength)
{
uint8_t *prov=(uint8_t*)malloc((size_t)*targetlength);
if(prov!=NULL){
if (!prov)
return PATCH_TARGET_ALLOC_FAILED;
free(*targetdata);
*targetdata = prov;
data.target_data = prov;
}else
return PATCH_TARGET_ALLOC_FAILED;
}
data.target_length = (unsigned)*targetlength;
@ -469,6 +472,7 @@ static enum patch_error ips_alloc_targetdata(
size |= patchdata[offset++] << 0;
*targetlength = size;
prov_alloc = (uint8_t*)malloc((size_t)*targetlength);
if (!prov_alloc)
return PATCH_TARGET_ALLOC_FAILED;
free(*targetdata);
@ -533,10 +537,9 @@ static enum patch_error ips_apply_patch(
patchdata[4] != 'H')
return PATCH_PATCH_INVALID;
error_patch = ips_alloc_targetdata( patchdata, patchlen,
sourcelength, targetdata,
targetlength);
if ( error_patch != PATCH_SUCCESS)
if ((error_patch = ips_alloc_targetdata(
patchdata, patchlen, sourcelength,
targetdata, targetlength)) != PATCH_SUCCESS)
return error_patch;
memcpy(*targetdata, sourcedata, (size_t)sourcelength);
@ -557,7 +560,8 @@ static enum patch_error ips_apply_patch(
{
if (offset == patchlen)
return PATCH_SUCCESS;
else if (offset == patchlen - 3)
if (offset == patchlen - 3)
{
uint32_t size = patchdata[offset++] << 16;
size |= patchdata[offset++] << 8;
@ -614,10 +618,8 @@ static bool apply_patch_content(uint8_t **buf,
RARCH_LOG("Found %s file in \"%s\", attempting to patch ...\n",
patch_desc, patch_path);
err = func((const uint8_t*)patch_data, patch_size, ret_buf,
ret_size, &patched_content, &target_size);
if (err == PATCH_SUCCESS)
if ((err = func((const uint8_t*)patch_data, patch_size, ret_buf,
ret_size, &patched_content, &target_size)) == PATCH_SUCCESS)
{
free(ret_buf);
*buf = patched_content;
@ -636,8 +638,10 @@ static bool apply_patch_content(uint8_t **buf,
static bool try_bps_patch(bool allow_bps, const char *name_bps,
uint8_t **buf, ssize_t *size)
{
if (allow_bps && !string_is_empty(name_bps))
if (path_is_valid(name_bps))
if ( allow_bps
&& !string_is_empty(name_bps)
&& path_is_valid(name_bps)
)
{
int64_t patch_size;
bool ret = false;
@ -647,24 +651,24 @@ static bool try_bps_patch(bool allow_bps, const char *name_bps,
return false;
if (patch_size >= 0)
{
ret = apply_patch_content(
buf, size, "BPS", name_bps,
ret = apply_patch_content(buf, size, "BPS", name_bps,
bps_apply_patch, patch_data, patch_size);
}
if (patch_data)
free(patch_data);
return ret;
}
return false;
}
static bool try_ups_patch(bool allow_ups, const char *name_ups,
uint8_t **buf, ssize_t *size)
{
if (allow_ups && !string_is_empty(name_ups))
if (path_is_valid(name_ups))
if ( allow_ups
&& !string_is_empty(name_ups)
&& path_is_valid(name_ups)
)
{
int64_t patch_size;
bool ret = false;
@ -674,11 +678,8 @@ static bool try_ups_patch(bool allow_ups, const char *name_ups,
return false;
if (patch_size >= 0)
{
ret = apply_patch_content(
buf, size, "UPS", name_ups,
ret = apply_patch_content(buf, size, "UPS", name_ups,
ups_apply_patch, patch_data, patch_size);
}
if (patch_data)
free(patch_data);
@ -690,8 +691,10 @@ static bool try_ups_patch(bool allow_ups, const char *name_ups,
static bool try_ips_patch(bool allow_ips,
const char *name_ips, uint8_t **buf, ssize_t *size)
{
if (allow_ips && !string_is_empty(name_ips))
if (path_is_valid(name_ips))
if ( allow_ips
&& !string_is_empty(name_ips)
&& path_is_valid(name_ips)
)
{
int64_t patch_size;
bool ret = false;
@ -701,11 +704,8 @@ static bool try_ips_patch(bool allow_ips,
return false;
if (patch_size >= 0)
{
ret = apply_patch_content(
buf, size, "IPS", name_ips,
ret = apply_patch_content(buf, size, "IPS", name_ips,
ips_apply_patch, patch_data, patch_size);
}
if (patch_data)
free(patch_data);