diff options
| author | xXx-caillou-xXx | 2018-08-30 17:14:08 +0200 |
|---|---|---|
| committer | jvoisin | 2018-08-30 15:14:08 +0000 |
| commit | 206ffa3fb3fd72c6a2eb45194fb176535a91288c (patch) | |
| tree | 23a25d83c4ca878861f413a0d5df2ad77c7dadaf /src/sp_session.c | |
| parent | b3f67a16094168cc334f5da93a86f09476e01601 (diff) | |
Minor code cleanup
Diffstat (limited to 'src/sp_session.c')
| -rw-r--r-- | src/sp_session.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/sp_session.c b/src/sp_session.c index 35866a1..8aad624 100644 --- a/src/sp_session.c +++ b/src/sp_session.c | |||
| @@ -23,16 +23,17 @@ static ZEND_INI_MH((*old_OnUpdateSaveHandler)) = NULL; | |||
| 23 | 23 | ||
| 24 | static int sp_hook_s_read(PS_READ_ARGS) { | 24 | static int sp_hook_s_read(PS_READ_ARGS) { |
| 25 | int r = old_s_read(mod_data, key, val, maxlifetime); | 25 | int r = old_s_read(mod_data, key, val, maxlifetime); |
| 26 | if (r == SUCCESS && SNUFFLEUPAGUS_G(config).config_session->encrypt && | 26 | const sp_config_session* config_session = SNUFFLEUPAGUS_G(config).config_session; |
| 27 | |||
| 28 | if (r == SUCCESS && config_session->encrypt && | ||
| 27 | val != NULL && *val != NULL && ZSTR_LEN(*val)) { | 29 | val != NULL && *val != NULL && ZSTR_LEN(*val)) { |
| 28 | zend_string *orig_val = *val; | 30 | zend_string *orig_val = *val; |
| 29 | zval val_zval; | 31 | zval val_zval; |
| 30 | ZVAL_PSTRINGL(&val_zval, ZSTR_VAL(*val), ZSTR_LEN(*val)); | 32 | ZVAL_PSTRINGL(&val_zval, ZSTR_VAL(*val), ZSTR_LEN(*val)); |
| 31 | 33 | ||
| 32 | int ret = decrypt_zval( | 34 | int ret = decrypt_zval(&val_zval, config_session->simulation, NULL); |
| 33 | &val_zval, SNUFFLEUPAGUS_G(config).config_session->simulation, NULL); | ||
| 34 | if (0 != ret) { | 35 | if (0 != ret) { |
| 35 | if (SNUFFLEUPAGUS_G(config).config_session->simulation) { | 36 | if (config_session->simulation) { |
| 36 | return ret; | 37 | return ret; |
| 37 | } else { | 38 | } else { |
| 38 | sp_terminate(); | 39 | sp_terminate(); |
