Skip to content

Commit 952222d

Browse files
committed
Move SessionHandler sanity checks after zpp
1 parent 9d2af91 commit 952222d

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

ext/session/mod_user_class.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ PHP_METHOD(SessionHandler, open)
4141
size_t save_path_len, session_name_len;
4242
int ret;
4343

44-
PS_SANITY_CHECK;
45-
4644
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &save_path, &save_path_len, &session_name, &session_name_len) == FAILURE) {
4745
RETURN_THROWS();
4846
}
4947

48+
PS_SANITY_CHECK;
49+
5050
PS(mod_user_is_open) = 1;
5151

5252
zend_try {
@@ -65,12 +65,12 @@ PHP_METHOD(SessionHandler, close)
6565
{
6666
int ret;
6767

68-
PS_SANITY_CHECK_IS_OPEN;
69-
7068
// don't return on failure, since not closing the default handler
7169
// could result in memory leaks or other nasties
7270
zend_parse_parameters_none();
7371

72+
PS_SANITY_CHECK_IS_OPEN;
73+
7474
PS(mod_user_is_open) = 0;
7575

7676
zend_try {
@@ -90,12 +90,12 @@ PHP_METHOD(SessionHandler, read)
9090
zend_string *val;
9191
zend_string *key;
9292

93-
PS_SANITY_CHECK_IS_OPEN;
94-
9593
if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &key) == FAILURE) {
9694
RETURN_THROWS();
9795
}
9896

97+
PS_SANITY_CHECK_IS_OPEN;
98+
9999
if (PS(default_mod)->s_read(&PS(mod_data), key, &val, PS(gc_maxlifetime)) == FAILURE) {
100100
RETURN_FALSE;
101101
}
@@ -109,12 +109,12 @@ PHP_METHOD(SessionHandler, write)
109109
{
110110
zend_string *key, *val;
111111

112-
PS_SANITY_CHECK_IS_OPEN;
113-
114112
if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS", &key, &val) == FAILURE) {
115113
RETURN_THROWS();
116114
}
117115

116+
PS_SANITY_CHECK_IS_OPEN;
117+
118118
RETURN_BOOL(SUCCESS == PS(default_mod)->s_write(&PS(mod_data), key, val, PS(gc_maxlifetime)));
119119
}
120120
/* }}} */
@@ -124,12 +124,12 @@ PHP_METHOD(SessionHandler, destroy)
124124
{
125125
zend_string *key;
126126

127-
PS_SANITY_CHECK_IS_OPEN;
128-
129127
if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &key) == FAILURE) {
130128
RETURN_THROWS();
131129
}
132130

131+
PS_SANITY_CHECK_IS_OPEN;
132+
133133
RETURN_BOOL(SUCCESS == PS(default_mod)->s_destroy(&PS(mod_data), key));
134134
}
135135
/* }}} */
@@ -140,12 +140,12 @@ PHP_METHOD(SessionHandler, gc)
140140
zend_long maxlifetime;
141141
zend_long nrdels = -1;
142142

143-
PS_SANITY_CHECK_IS_OPEN;
144-
145143
if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &maxlifetime) == FAILURE) {
146144
RETURN_THROWS();
147145
}
148146

147+
PS_SANITY_CHECK_IS_OPEN;
148+
149149
if (PS(default_mod)->s_gc(&PS(mod_data), maxlifetime, &nrdels) == FAILURE) {
150150
RETURN_FALSE;
151151
}
@@ -158,12 +158,12 @@ PHP_METHOD(SessionHandler, create_sid)
158158
{
159159
zend_string *id;
160160

161-
PS_SANITY_CHECK;
162-
163161
if (zend_parse_parameters_none() == FAILURE) {
164162
RETURN_THROWS();
165163
}
166164

165+
PS_SANITY_CHECK;
166+
167167
id = PS(default_mod)->s_create_sid(&PS(mod_data));
168168

169169
RETURN_STR(id);

0 commit comments

Comments
 (0)