From 5530b7022febf44093a20da98f14027bb73b125a Mon Sep 17 00:00:00 2001 From: Jamiras Date: Sat, 10 Apr 2021 14:51:41 -0600 Subject: [PATCH] attempt to silence return-local-addr warning --- deps/rcheevos/src/rcheevos/lboard.c | 6 +++++- deps/rcheevos/src/rcheevos/richpresence.c | 6 +++++- deps/rcheevos/src/rcheevos/trigger.c | 6 +++++- deps/rcheevos/src/rcheevos/value.c | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/deps/rcheevos/src/rcheevos/lboard.c b/deps/rcheevos/src/rcheevos/lboard.c index 5eb107d52f..b46a1bdf5a 100644 --- a/deps/rcheevos/src/rcheevos/lboard.c +++ b/deps/rcheevos/src/rcheevos/lboard.c @@ -151,6 +151,10 @@ int rc_lboard_size(const char* memaddr) { rc_lboard_t* rc_parse_lboard(void* buffer, const char* memaddr, lua_State* L, int funcs_ndx) { rc_lboard_t* self; rc_parse_state_t parse; + + if (!buffer || !memaddr) + return 0; + rc_init_parse_state(&parse, buffer, L, funcs_ndx); self = RC_ALLOC(rc_lboard_t, &parse); @@ -159,7 +163,7 @@ rc_lboard_t* rc_parse_lboard(void* buffer, const char* memaddr, lua_State* L, in rc_parse_lboard_internal(self, memaddr, &parse); rc_destroy_parse_state(&parse); - return parse.offset >= 0 ? self : 0; + return (parse.offset >= 0) ? self : 0; } int rc_evaluate_lboard(rc_lboard_t* self, int* value, rc_peek_t peek, void* peek_ud, lua_State* L) { diff --git a/deps/rcheevos/src/rcheevos/richpresence.c b/deps/rcheevos/src/rcheevos/richpresence.c index ef02b0adb9..aa7ee516b9 100644 --- a/deps/rcheevos/src/rcheevos/richpresence.c +++ b/deps/rcheevos/src/rcheevos/richpresence.c @@ -394,6 +394,10 @@ int rc_richpresence_size(const char* script) { rc_richpresence_t* rc_parse_richpresence(void* buffer, const char* script, lua_State* L, int funcs_ndx) { rc_richpresence_t* self; rc_parse_state_t parse; + + if (!buffer || !script) + return 0; + rc_init_parse_state(&parse, buffer, L, funcs_ndx); self = RC_ALLOC(rc_richpresence_t, &parse); @@ -402,7 +406,7 @@ rc_richpresence_t* rc_parse_richpresence(void* buffer, const char* script, lua_S rc_parse_richpresence_internal(self, script, &parse); rc_destroy_parse_state(&parse); - return parse.offset >= 0 ? self : 0; + return (parse.offset >= 0) ? self : 0; } int rc_evaluate_richpresence(rc_richpresence_t* richpresence, char* buffer, unsigned buffersize, rc_peek_t peek, void* peek_ud, lua_State* L) { diff --git a/deps/rcheevos/src/rcheevos/trigger.c b/deps/rcheevos/src/rcheevos/trigger.c index 73f0e7839c..04f40e54ed 100644 --- a/deps/rcheevos/src/rcheevos/trigger.c +++ b/deps/rcheevos/src/rcheevos/trigger.c @@ -58,6 +58,10 @@ int rc_trigger_size(const char* memaddr) { rc_trigger_t* rc_parse_trigger(void* buffer, const char* memaddr, lua_State* L, int funcs_ndx) { rc_trigger_t* self; rc_parse_state_t parse; + + if (!buffer || !memaddr) + return 0; + rc_init_parse_state(&parse, buffer, L, funcs_ndx); self = RC_ALLOC(rc_trigger_t, &parse); @@ -66,7 +70,7 @@ rc_trigger_t* rc_parse_trigger(void* buffer, const char* memaddr, lua_State* L, rc_parse_trigger_internal(self, &memaddr, &parse); rc_destroy_parse_state(&parse); - return parse.offset >= 0 ? self : 0; + return (parse.offset >= 0) ? self : 0; } static void rc_reset_trigger_hitcounts(rc_trigger_t* self) { diff --git a/deps/rcheevos/src/rcheevos/value.c b/deps/rcheevos/src/rcheevos/value.c index 4346492386..dbabf9257e 100644 --- a/deps/rcheevos/src/rcheevos/value.c +++ b/deps/rcheevos/src/rcheevos/value.c @@ -201,6 +201,10 @@ int rc_value_size(const char* memaddr) { rc_value_t* rc_parse_value(void* buffer, const char* memaddr, lua_State* L, int funcs_ndx) { rc_value_t* self; rc_parse_state_t parse; + + if (!buffer || !memaddr) + return 0; + rc_init_parse_state(&parse, buffer, L, funcs_ndx); self = RC_ALLOC(rc_value_t, &parse); @@ -209,7 +213,7 @@ rc_value_t* rc_parse_value(void* buffer, const char* memaddr, lua_State* L, int rc_parse_value_internal(self, &memaddr, &parse); rc_destroy_parse_state(&parse); - return parse.offset >= 0 ? self : 0; + return (parse.offset >= 0) ? self : 0; } int rc_evaluate_value(rc_value_t* self, rc_peek_t peek, void* ud, lua_State* L) {