Skip to content

Commit 7346b71

Browse files
avsejavsej
committed
Fix operation options access
Change-Id: Iafdd51877a11073ac458630f4470eb53c38dd82a Reviewed-on: http://review.couchbase.org/109813 Tested-by: Build Bot <[email protected]> Reviewed-by: Sergey Avseyev <[email protected]>
1 parent d7a79e6 commit 7346b71

File tree

14 files changed

+57
-57
lines changed

14 files changed

+57
-57
lines changed

‎src/couchbase/bucket/cbas.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ PHP_METHOD(Bucket, analyticsQuery)
8484
{
8585
lcb_STATUS err;
8686
zend_string *statement;
87-
zval *options;
87+
zval *options = NULL;
8888

8989
int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "S|z", &statement, &options);
9090
if (rv == FAILURE) {

‎src/couchbase/bucket/cbft.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ PHP_METHOD(Bucket, searchQuery)
8989
lcb_STATUS err;
9090
zend_string *index;
9191
zval *query;
92-
zval *options;
92+
zval *options = NULL;
9393
int rv;
9494

9595
rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SO|z", &index, &query, pcbc_search_query_ce, &options);

‎src/couchbase/bucket/counter.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ PHP_METHOD(Collection, increment)
134134
{
135135
lcb_STATUS err = LCB_SUCCESS;
136136
zend_string *id;
137-
zval *options;
137+
zval *options = NULL;
138138

139139
int rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|O", &id, &options, pcbc_counter_options_ce);
140140
if (rv == FAILURE) {
@@ -149,15 +149,15 @@ PHP_METHOD(Collection, increment)
149149
lcb_cmdcounter_delta(cmd, +1);
150150
if (options) {
151151
zval *prop, ret;
152-
prop = zend_read_property(pcbc_counter_options_ce, getThis(), ZEND_STRL("timeout"), 0, &ret);
152+
prop = zend_read_property(pcbc_counter_options_ce, options, ZEND_STRL("timeout"), 0, &ret);
153153
if (Z_TYPE_P(prop) == IS_LONG) {
154154
lcb_cmdcounter_timeout(cmd, Z_LVAL_P(prop));
155155
}
156-
prop = zend_read_property(pcbc_counter_options_ce, getThis(), ZEND_STRL("durability_level"), 0, &ret);
156+
prop = zend_read_property(pcbc_counter_options_ce, options, ZEND_STRL("durability_level"), 0, &ret);
157157
if (Z_TYPE_P(prop) == IS_LONG) {
158158
lcb_cmdcounter_durability(cmd, Z_LVAL_P(prop));
159159
}
160-
prop = zend_read_property(pcbc_counter_options_ce, getThis(), ZEND_STRL("expiration"), 0, &ret);
160+
prop = zend_read_property(pcbc_counter_options_ce, options, ZEND_STRL("expiration"), 0, &ret);
161161
if (Z_TYPE_P(prop) == IS_LONG) {
162162
lcb_cmdcounter_expiration(cmd, 0);
163163
}
@@ -197,7 +197,7 @@ PHP_METHOD(Collection, decrement)
197197
{
198198
lcb_STATUS err = LCB_SUCCESS;
199199
zend_string *id;
200-
zval *options;
200+
zval *options = NULL;
201201

202202
int rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|O", &id, &options, pcbc_counter_options_ce);
203203
if (rv == FAILURE) {
@@ -212,7 +212,7 @@ PHP_METHOD(Collection, decrement)
212212
lcb_cmdcounter_delta(cmd, -1);
213213
if (options) {
214214
zval *prop, ret;
215-
prop = zend_read_property(pcbc_counter_options_ce, getThis(), ZEND_STRL("timeout"), 0, &ret);
215+
prop = zend_read_property(pcbc_counter_options_ce, options, ZEND_STRL("timeout"), 0, &ret);
216216
if (Z_TYPE_P(prop) == IS_LONG) {
217217
lcb_cmdcounter_timeout(cmd, Z_LVAL_P(prop));
218218
}

‎src/couchbase/bucket/exists.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ static const zend_function_entry pcbc_exists_options_methods[] = {
7474
PHP_METHOD(Collection, exists)
7575
{
7676
zend_string *id;
77-
zval *options;
77+
zval *options = NULL;
7878
lcb_STATUS err;
7979

8080
int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS(), "S|O", &id, &options, pcbc_exists_options_ce);
@@ -89,7 +89,7 @@ PHP_METHOD(Collection, exists)
8989
lcb_cmdexists_key(cmd, ZSTR_VAL(id), ZSTR_LEN(id));
9090
if (options) {
9191
zval *prop, ret;
92-
prop = zend_read_property(pcbc_exists_options_ce, getThis(), ZEND_STRL("timeout"), 0, &ret);
92+
prop = zend_read_property(pcbc_exists_options_ce, options, ZEND_STRL("timeout"), 0, &ret);
9393
if (Z_TYPE_P(prop) == IS_LONG) {
9494
lcb_cmdexists_timeout(cmd, Z_LVAL_P(prop));
9595
}

‎src/couchbase/bucket/get.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static const zend_function_entry pcbc_get_options_methods[] = {
112112
PHP_METHOD(Collection, get)
113113
{
114114
zend_string *id;
115-
zval *options;
115+
zval *options = NULL;
116116
lcb_STATUS err;
117117

118118
int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS(), "S|O", &id, &options, pcbc_get_options_ce);
@@ -127,7 +127,7 @@ PHP_METHOD(Collection, get)
127127
lcb_cmdget_key(cmd, ZSTR_VAL(id), ZSTR_LEN(id));
128128
if (options) {
129129
zval *prop, ret;
130-
prop = zend_read_property(pcbc_get_options_ce, getThis(), ZEND_STRL("timeout"), 0, &ret);
130+
prop = zend_read_property(pcbc_get_options_ce, options, ZEND_STRL("timeout"), 0, &ret);
131131
if (Z_TYPE_P(prop) == IS_LONG) {
132132
lcb_cmdget_timeout(cmd, Z_LVAL_P(prop));
133133
}
@@ -187,7 +187,7 @@ static const zend_function_entry pcbc_get_and_lock_options_methods[] = {
187187
PHP_METHOD(Collection, getAndLock)
188188
{
189189
zend_string *id;
190-
zval *options;
190+
zval *options = NULL;
191191
zend_long expiry;
192192
lcb_STATUS err;
193193

@@ -205,7 +205,7 @@ PHP_METHOD(Collection, getAndLock)
205205

206206
if (options) {
207207
zval *prop, ret;
208-
prop = zend_read_property(pcbc_get_and_lock_options_ce, getThis(), ZEND_STRL("timeout"), 0, &ret);
208+
prop = zend_read_property(pcbc_get_and_lock_options_ce, options, ZEND_STRL("timeout"), 0, &ret);
209209
if (Z_TYPE_P(prop) == IS_LONG) {
210210
lcb_cmdget_timeout(cmd, Z_LVAL_P(prop));
211211
}
@@ -263,7 +263,7 @@ static const zend_function_entry pcbc_get_and_touch_options_methods[] = {
263263
PHP_METHOD(Collection, getAndTouch)
264264
{
265265
zend_string *id;
266-
zval *options;
266+
zval *options = NULL;
267267
zend_long expiry;
268268
lcb_STATUS err;
269269

@@ -281,7 +281,7 @@ PHP_METHOD(Collection, getAndTouch)
281281

282282
if (options) {
283283
zval *prop, ret;
284-
prop = zend_read_property(pcbc_get_and_touch_options_ce, getThis(), ZEND_STRL("timeout"), 0, &ret);
284+
prop = zend_read_property(pcbc_get_and_touch_options_ce, options, ZEND_STRL("timeout"), 0, &ret);
285285
if (Z_TYPE_P(prop) == IS_LONG) {
286286
lcb_cmdget_timeout(cmd, Z_LVAL_P(prop));
287287
}

‎src/couchbase/bucket/get_replica.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ static const zend_function_entry pcbc_get_any_replica_options_methods[] = {
8888
PHP_METHOD(Collection, getAnyReplica)
8989
{
9090
zend_string *id;
91-
zval *options;
91+
zval *options = NULL;
9292
lcb_STATUS err;
9393

9494
int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "S|O", &id, &options, pcbc_get_any_replica_options_ce);
@@ -103,7 +103,7 @@ PHP_METHOD(Collection, getAnyReplica)
103103
lcb_cmdgetreplica_key(cmd, ZSTR_VAL(id), ZSTR_LEN(id));
104104
if (options) {
105105
zval *prop, ret;
106-
prop = zend_read_property(pcbc_get_any_replica_options_ce, getThis(), ZEND_STRL("timeout"), 0, &ret);
106+
prop = zend_read_property(pcbc_get_any_replica_options_ce, options, ZEND_STRL("timeout"), 0, &ret);
107107
if (Z_TYPE_P(prop) == IS_LONG) {
108108
lcb_cmdgetreplica_timeout(cmd, Z_LVAL_P(prop));
109109
}
@@ -163,7 +163,7 @@ static const zend_function_entry pcbc_get_all_replicas_options_methods[] = {
163163
PHP_METHOD(Collection, getAllReplicas)
164164
{
165165
zend_string *id;
166-
zval *options;
166+
zval *options = NULL;
167167
lcb_STATUS err;
168168

169169
int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "S|O", &id, &options, pcbc_get_all_replicas_options_ce);
@@ -178,7 +178,7 @@ PHP_METHOD(Collection, getAllReplicas)
178178
lcb_cmdgetreplica_key(cmd, ZSTR_VAL(id), ZSTR_LEN(id));
179179
if (options) {
180180
zval *prop, ret;
181-
prop = zend_read_property(pcbc_get_all_replicas_options_ce, getThis(), ZEND_STRL("timeout"), 0, &ret);
181+
prop = zend_read_property(pcbc_get_all_replicas_options_ce, options, ZEND_STRL("timeout"), 0, &ret);
182182
if (Z_TYPE_P(prop) == IS_LONG) {
183183
lcb_cmdgetreplica_timeout(cmd, Z_LVAL_P(prop));
184184
}

‎src/couchbase/bucket/health.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void ping_callback(lcb_INSTANCE * instance, int cbtype, const lcb_RESPPING *res
7171
PHP_METHOD(Bucket, ping)
7272
{
7373
pcbc_bucket_t *obj = Z_BUCKET_OBJ_P(getThis());
74-
zval *options;
74+
zval *options = NULL;
7575
int rv;
7676
lcb_STATUS err;
7777

‎src/couchbase/bucket/n1ql.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ PHP_METHOD(Bucket, query)
8383
{
8484
lcb_STATUS err;
8585
zend_string *statement;
86-
zval *options;
86+
zval *options = NULL;
8787

8888
int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "S|z", &statement, &options);
8989
if (rv == FAILURE) {

‎src/couchbase/bucket/remove.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ static const zend_function_entry pcbc_remove_options_methods[] = {
135135
PHP_METHOD(Collection, remove)
136136
{
137137
zend_string *id;
138-
zval *options;
138+
zval *options = NULL;
139139
lcb_STATUS err;
140140

141141
int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "S|O", &id, &options, pcbc_remove_options_ce);
@@ -150,15 +150,15 @@ PHP_METHOD(Collection, remove)
150150
lcb_cmdremove_key(cmd, ZSTR_VAL(id), ZSTR_LEN(id));
151151
if (options) {
152152
zval *prop, ret;
153-
prop = zend_read_property(pcbc_remove_options_ce, getThis(), ZEND_STRL("timeout"), 0, &ret);
153+
prop = zend_read_property(pcbc_remove_options_ce, options, ZEND_STRL("timeout"), 0, &ret);
154154
if (Z_TYPE_P(prop) == IS_LONG) {
155155
lcb_cmdremove_timeout(cmd, Z_LVAL_P(prop));
156156
}
157-
prop = zend_read_property(pcbc_remove_options_ce, getThis(), ZEND_STRL("durability_level"), 0, &ret);
157+
prop = zend_read_property(pcbc_remove_options_ce, options, ZEND_STRL("durability_level"), 0, &ret);
158158
if (Z_TYPE_P(prop) == IS_LONG) {
159159
lcb_cmdremove_durability(cmd, Z_LVAL_P(prop));
160160
}
161-
prop = zend_read_property(pcbc_remove_options_ce, getThis(), ZEND_STRL("cas"), 0, &ret);
161+
prop = zend_read_property(pcbc_remove_options_ce, options, ZEND_STRL("cas"), 0, &ret);
162162
if (Z_TYPE_P(prop) == IS_STRING) {
163163
zend_string *decoded = php_base64_decode(Z_STRVAL_P(prop), Z_STRLEN_P(prop));
164164
if (decoded) {

‎src/couchbase/bucket/store.c

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -157,15 +157,15 @@ PHP_METHOD(Collection, insert)
157157
lcb_cmdstore_collection(cmd, scope_str, scope_len, collection_str, collection_len);
158158
if (options) {
159159
zval *prop, ret;
160-
prop = zend_read_property(pcbc_insert_options_ce, getThis(), ZEND_STRL("timeout"), 0, &ret);
160+
prop = zend_read_property(pcbc_insert_options_ce, options, ZEND_STRL("timeout"), 0, &ret);
161161
if (Z_TYPE_P(prop) == IS_LONG) {
162162
lcb_cmdstore_timeout(cmd, Z_LVAL_P(prop));
163163
}
164-
prop = zend_read_property(pcbc_insert_options_ce, getThis(), ZEND_STRL("expiration"), 0, &ret);
164+
prop = zend_read_property(pcbc_insert_options_ce, options, ZEND_STRL("expiration"), 0, &ret);
165165
if (Z_TYPE_P(prop) == IS_LONG) {
166166
lcb_cmdstore_expiration(cmd, Z_LVAL_P(prop));
167167
}
168-
prop = zend_read_property(pcbc_insert_options_ce, getThis(), ZEND_STRL("durability_level"), 0, &ret);
168+
prop = zend_read_property(pcbc_insert_options_ce, options, ZEND_STRL("durability_level"), 0, &ret);
169169
if (Z_TYPE_P(prop) == IS_LONG) {
170170
lcb_cmdstore_durability(cmd, Z_LVAL_P(prop));
171171
}
@@ -321,19 +321,19 @@ PHP_METHOD(Collection, upsert)
321321
lcb_cmdstore_collection(cmd, scope_str, scope_len, collection_str, collection_len);
322322
if (options) {
323323
zval *prop, ret;
324-
prop = zend_read_property(pcbc_upsert_options_ce, getThis(), ZEND_STRL("timeout"), 0, &ret);
324+
prop = zend_read_property(pcbc_upsert_options_ce, options, ZEND_STRL("timeout"), 0, &ret);
325325
if (Z_TYPE_P(prop) == IS_LONG) {
326326
lcb_cmdstore_timeout(cmd, Z_LVAL_P(prop));
327327
}
328-
prop = zend_read_property(pcbc_upsert_options_ce, getThis(), ZEND_STRL("expiration"), 0, &ret);
328+
prop = zend_read_property(pcbc_upsert_options_ce, options, ZEND_STRL("expiration"), 0, &ret);
329329
if (Z_TYPE_P(prop) == IS_LONG) {
330330
lcb_cmdstore_expiration(cmd, Z_LVAL_P(prop));
331331
}
332-
prop = zend_read_property(pcbc_upsert_options_ce, getThis(), ZEND_STRL("durability_level"), 0, &ret);
332+
prop = zend_read_property(pcbc_upsert_options_ce, options, ZEND_STRL("durability_level"), 0, &ret);
333333
if (Z_TYPE_P(prop) == IS_LONG) {
334334
lcb_cmdstore_durability(cmd, Z_LVAL_P(prop));
335335
}
336-
prop = zend_read_property(pcbc_upsert_options_ce, getThis(), ZEND_STRL("cas"), 0, &ret);
336+
prop = zend_read_property(pcbc_upsert_options_ce, options, ZEND_STRL("cas"), 0, &ret);
337337
if (Z_TYPE_P(prop) == IS_STRING) {
338338
zend_string *decoded = php_base64_decode(Z_STRVAL_P(prop), Z_STRLEN_P(prop));
339339
if (decoded) {
@@ -495,19 +495,19 @@ PHP_METHOD(Collection, replace)
495495
lcb_cmdstore_collection(cmd, scope_str, scope_len, collection_str, collection_len);
496496
if (options) {
497497
zval *prop, ret;
498-
prop = zend_read_property(pcbc_replace_options_ce, getThis(), ZEND_STRL("timeout"), 0, &ret);
498+
prop = zend_read_property(pcbc_replace_options_ce, options, ZEND_STRL("timeout"), 0, &ret);
499499
if (Z_TYPE_P(prop) == IS_LONG) {
500500
lcb_cmdstore_timeout(cmd, Z_LVAL_P(prop));
501501
}
502-
prop = zend_read_property(pcbc_replace_options_ce, getThis(), ZEND_STRL("expiration"), 0, &ret);
502+
prop = zend_read_property(pcbc_replace_options_ce, options, ZEND_STRL("expiration"), 0, &ret);
503503
if (Z_TYPE_P(prop) == IS_LONG) {
504504
lcb_cmdstore_expiration(cmd, Z_LVAL_P(prop));
505505
}
506-
prop = zend_read_property(pcbc_replace_options_ce, getThis(), ZEND_STRL("durability_level"), 0, &ret);
506+
prop = zend_read_property(pcbc_replace_options_ce, options, ZEND_STRL("durability_level"), 0, &ret);
507507
if (Z_TYPE_P(prop) == IS_LONG) {
508508
lcb_cmdstore_durability(cmd, Z_LVAL_P(prop));
509509
}
510-
prop = zend_read_property(pcbc_replace_options_ce, getThis(), ZEND_STRL("cas"), 0, &ret);
510+
prop = zend_read_property(pcbc_replace_options_ce, options, ZEND_STRL("cas"), 0, &ret);
511511
if (Z_TYPE_P(prop) == IS_STRING) {
512512
zend_string *decoded = php_base64_decode(Z_STRVAL_P(prop), Z_STRLEN_P(prop));
513513
if (decoded) {
@@ -639,7 +639,7 @@ static const zend_function_entry pcbc_append_options_methods[] = {
639639
PHP_METHOD(Collection, append)
640640
{
641641
zend_string *id, *value;
642-
zval *options;
642+
zval *options = NULL;
643643
lcb_STATUS err;
644644

645645
int rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|O", &id, &value, &options, pcbc_append_options_ce);
@@ -653,15 +653,15 @@ PHP_METHOD(Collection, append)
653653
lcb_cmdstore_collection(cmd, scope_str, scope_len, collection_str, collection_len);
654654
if (options) {
655655
zval *prop, ret;
656-
prop = zend_read_property(pcbc_append_options_ce, getThis(), ZEND_STRL("timeout"), 0, &ret);
656+
prop = zend_read_property(pcbc_append_options_ce, options, ZEND_STRL("timeout"), 0, &ret);
657657
if (Z_TYPE_P(prop) == IS_LONG) {
658658
lcb_cmdstore_timeout(cmd, Z_LVAL_P(prop));
659659
}
660-
prop = zend_read_property(pcbc_append_options_ce, getThis(), ZEND_STRL("durability_level"), 0, &ret);
660+
prop = zend_read_property(pcbc_append_options_ce, options, ZEND_STRL("durability_level"), 0, &ret);
661661
if (Z_TYPE_P(prop) == IS_LONG) {
662662
lcb_cmdstore_durability(cmd, Z_LVAL_P(prop));
663663
}
664-
prop = zend_read_property(pcbc_append_options_ce, getThis(), ZEND_STRL("cas"), 0, &ret);
664+
prop = zend_read_property(pcbc_append_options_ce, options, ZEND_STRL("cas"), 0, &ret);
665665
if (Z_TYPE_P(prop) == IS_STRING) {
666666
zend_string *decoded = php_base64_decode(Z_STRVAL_P(prop), Z_STRLEN_P(prop));
667667
if (decoded) {
@@ -767,7 +767,7 @@ static const zend_function_entry pcbc_prepend_options_methods[] = {
767767
PHP_METHOD(Collection, prepend)
768768
{
769769
zend_string *id, *value;
770-
zval *options;
770+
zval *options = NULL;
771771
lcb_STATUS err;
772772

773773
int rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|O", &id, &value, &options, pcbc_prepend_options_ce);
@@ -781,15 +781,15 @@ PHP_METHOD(Collection, prepend)
781781
lcb_cmdstore_collection(cmd, scope_str, scope_len, collection_str, collection_len);
782782
if (options) {
783783
zval *prop, ret;
784-
prop = zend_read_property(pcbc_append_options_ce, getThis(), ZEND_STRL("timeout"), 0, &ret);
784+
prop = zend_read_property(pcbc_append_options_ce, options, ZEND_STRL("timeout"), 0, &ret);
785785
if (Z_TYPE_P(prop) == IS_LONG) {
786786
lcb_cmdstore_timeout(cmd, Z_LVAL_P(prop));
787787
}
788-
prop = zend_read_property(pcbc_append_options_ce, getThis(), ZEND_STRL("durability_level"), 0, &ret);
788+
prop = zend_read_property(pcbc_append_options_ce, options, ZEND_STRL("durability_level"), 0, &ret);
789789
if (Z_TYPE_P(prop) == IS_LONG) {
790790
lcb_cmdstore_durability(cmd, Z_LVAL_P(prop));
791791
}
792-
prop = zend_read_property(pcbc_append_options_ce, getThis(), ZEND_STRL("cas"), 0, &ret);
792+
prop = zend_read_property(pcbc_append_options_ce, options, ZEND_STRL("cas"), 0, &ret);
793793
if (Z_TYPE_P(prop) == IS_STRING) {
794794
zend_string *decoded = php_base64_decode(Z_STRVAL_P(prop), Z_STRLEN_P(prop));
795795
if (decoded) {

0 commit comments

Comments
 (0)