summaryrefslogtreecommitdiff
path: root/src/sp_unserialize.c
diff options
context:
space:
mode:
authorBen Fuhrmannek2021-02-16 11:16:59 +0100
committerBen Fuhrmannek2021-02-16 11:16:59 +0100
commit5484bcb5eb2714e7438927e2566c86a74d7c51af (patch)
treeb78326d2999397be4c08e06b23209981f82a4ea9 /src/sp_unserialize.c
parent7ac1e3866ef4f146c6c93a5ca13b9aebb14e936a (diff)
parentcecfdd808da67be908dbe7144cc8c74dfb3f855e (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/sp_unserialize.c')
-rw-r--r--src/sp_unserialize.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/sp_unserialize.c b/src/sp_unserialize.c
index f265ce6..8977dd9 100644
--- a/src/sp_unserialize.c
+++ b/src/sp_unserialize.c
@@ -1,6 +1,5 @@
1#include "php_snuffleupagus.h" 1#include "php_snuffleupagus.h"
2 2
3
4PHP_FUNCTION(sp_serialize) { 3PHP_FUNCTION(sp_serialize) {
5 zif_handler orig_handler; 4 zif_handler orig_handler;
6 5
@@ -62,8 +61,7 @@ PHP_FUNCTION(sp_unserialize) {
62 61
63 /* 64 is the length of HMAC-256 */ 62 /* 64 is the length of HMAC-256 */
64 if (buf_len < 64) { 63 if (buf_len < 64) {
65 sp_log_msg("unserialize", SP_LOG_DROP, 64 sp_log_drop("unserialize", "The serialized object is too small.");
66 "The serialized object is too small.");
67 } 65 }
68 66
69 hmac = buf + buf_len - 64; 67 hmac = buf + buf_len - 64;
@@ -100,16 +98,14 @@ PHP_FUNCTION(sp_unserialize) {
100 SP_TOKEN_UNSERIALIZE_HMAC); 98 SP_TOKEN_UNSERIALIZE_HMAC);
101 } 99 }
102 if (true == config_unserialize->simulation) { 100 if (true == config_unserialize->simulation) {
103 sp_log_msg("unserialize", SP_LOG_SIMULATION, "Invalid HMAC for %s", 101 sp_log_simulation("unserialize", "Invalid HMAC for %s", serialized_str);
104 serialized_str);
105 if ((orig_handler = zend_hash_str_find_ptr( 102 if ((orig_handler = zend_hash_str_find_ptr(
106 SNUFFLEUPAGUS_G(sp_internal_functions_hook), "unserialize", 103 SNUFFLEUPAGUS_G(sp_internal_functions_hook), "unserialize",
107 sizeof("unserialize") - 1))) { 104 sizeof("unserialize") - 1))) {
108 orig_handler(INTERNAL_FUNCTION_PARAM_PASSTHRU); 105 orig_handler(INTERNAL_FUNCTION_PARAM_PASSTHRU);
109 } 106 }
110 } else { 107 } else {
111 sp_log_msg("unserialize", SP_LOG_DROP, "Invalid HMAC for %s", 108 sp_log_drop("unserialize", "Invalid HMAC for %s", serialized_str);
112 serialized_str);
113 } 109 }
114 } 110 }
115 efree(serialized_str); 111 efree(serialized_str);