Skip to content

Commit 9955230

Browse files
kocsismatekocsismate
committed
Fix order of ZPP in ext/sqlite3
1 parent 4815be4 commit 9955230

File tree

1 file changed

+50
-49
lines changed

1 file changed

+50
-49
lines changed

‎ext/sqlite3/sqlite3.c

Lines changed: 50 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -215,12 +215,12 @@ PHP_METHOD(SQLite3, exec)
215215
char *errtext = NULL;
216216
db_obj = Z_SQLITE3_DB_P(object);
217217

218-
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
219-
220218
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "S", &sql)) {
221219
RETURN_THROWS();
222220
}
223221

222+
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
223+
224224
if (sqlite3_exec(db_obj->db, ZSTR_VAL(sql), NULL, NULL, &errtext) != SQLITE_OK) {
225225
php_sqlite3_error(db_obj, "%s", errtext);
226226
sqlite3_free(errtext);
@@ -256,12 +256,12 @@ PHP_METHOD(SQLite3, lastInsertRowID)
256256
zval *object = ZEND_THIS;
257257
db_obj = Z_SQLITE3_DB_P(object);
258258

259-
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
260-
261259
if (zend_parse_parameters_none() == FAILURE) {
262260
RETURN_THROWS();
263261
}
264262

263+
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
264+
265265
RETURN_LONG((zend_long) sqlite3_last_insert_rowid(db_obj->db));
266266
}
267267
/* }}} */
@@ -274,12 +274,12 @@ PHP_METHOD(SQLite3, lastErrorCode)
274274
zval *object = ZEND_THIS;
275275
db_obj = Z_SQLITE3_DB_P(object);
276276

277-
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->db, SQLite3)
278-
279277
if (zend_parse_parameters_none() == FAILURE) {
280278
RETURN_THROWS();
281279
}
282280

281+
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->db, SQLite3)
282+
283283
if (db_obj->initialised) {
284284
RETURN_LONG(sqlite3_errcode(db_obj->db));
285285
} else {
@@ -296,12 +296,12 @@ PHP_METHOD(SQLite3, lastExtendedErrorCode)
296296
zval *object = ZEND_THIS;
297297
db_obj = Z_SQLITE3_DB_P(object);
298298

299-
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->db, SQLite3)
300-
301299
if (zend_parse_parameters_none() == FAILURE) {
302300
RETURN_THROWS();
303301
}
304302

303+
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->db, SQLite3)
304+
305305
if (db_obj->initialised) {
306306
RETURN_LONG(sqlite3_extended_errcode(db_obj->db));
307307
} else {
@@ -320,12 +320,12 @@ PHP_METHOD(SQLite3, enableExtendedResultCodes)
320320
db_obj = Z_SQLITE3_DB_P(object);
321321
int ret;
322322

323-
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->db, SQLite3)
324-
325323
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|b", &enable) == FAILURE) {
326324
RETURN_THROWS();
327325
}
328326

327+
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->db, SQLite3)
328+
329329
if (db_obj->initialised) {
330330
ret = sqlite3_extended_result_codes(db_obj->db, enable ? 1 : 0);
331331
if (ret == SQLITE_OK)
@@ -346,12 +346,12 @@ PHP_METHOD(SQLite3, lastErrorMsg)
346346
zval *object = ZEND_THIS;
347347
db_obj = Z_SQLITE3_DB_P(object);
348348

349-
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->db, SQLite3)
350-
351349
if (zend_parse_parameters_none() == FAILURE) {
352350
RETURN_THROWS();
353351
}
354352

353+
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->db, SQLite3)
354+
355355
if (db_obj->initialised) {
356356
RETURN_STRING((char *)sqlite3_errmsg(db_obj->db));
357357
} else {
@@ -372,12 +372,12 @@ PHP_METHOD(SQLite3, busyTimeout)
372372
#endif
373373
db_obj = Z_SQLITE3_DB_P(object);
374374

375-
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
376-
377375
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "l", &ms)) {
378376
RETURN_THROWS();
379377
}
380378

379+
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
380+
381381
#ifdef SQLITE_ENABLE_API_ARMOR
382382
return_code = sqlite3_busy_timeout(db_obj->db, ms);
383383
if (return_code != SQLITE_OK) {
@@ -405,12 +405,12 @@ PHP_METHOD(SQLite3, loadExtension)
405405
size_t extension_len, extension_dir_len;
406406
db_obj = Z_SQLITE3_DB_P(object);
407407

408-
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
409-
410408
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s", &extension, &extension_len)) {
411409
RETURN_THROWS();
412410
}
413411

412+
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
413+
414414
#ifdef ZTS
415415
if ((strncmp(sapi_module.name, "cgi", 3) != 0) &&
416416
(strcmp(sapi_module.name, "cli") != 0) &&
@@ -475,12 +475,12 @@ PHP_METHOD(SQLite3, changes)
475475
zval *object = ZEND_THIS;
476476
db_obj = Z_SQLITE3_DB_P(object);
477477

478-
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
479-
480478
if (zend_parse_parameters_none() == FAILURE) {
481479
RETURN_THROWS();
482480
}
483481

482+
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
483+
484484
RETURN_LONG(sqlite3_changes(db_obj->db));
485485
}
486486
/* }}} */
@@ -521,12 +521,12 @@ PHP_METHOD(SQLite3, prepare)
521521

522522
db_obj = Z_SQLITE3_DB_P(object);
523523

524-
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
525-
526524
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "S", &sql)) {
527525
RETURN_THROWS();
528526
}
529527

528+
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
529+
530530
if (!ZSTR_LEN(sql)) {
531531
RETURN_FALSE;
532532
}
@@ -568,12 +568,12 @@ PHP_METHOD(SQLite3, query)
568568
int return_code;
569569
db_obj = Z_SQLITE3_DB_P(object);
570570

571-
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
572-
573571
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "S", &sql)) {
574572
RETURN_THROWS();
575573
}
576574

575+
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
576+
577577
if (!ZSTR_LEN(sql)) {
578578
RETURN_FALSE;
579579
}
@@ -684,12 +684,12 @@ PHP_METHOD(SQLite3, querySingle)
684684
sqlite3_stmt *stmt;
685685
db_obj = Z_SQLITE3_DB_P(object);
686686

687-
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
688-
689687
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "S|b", &sql, &entire_row)) {
690688
RETURN_THROWS();
691689
}
692690

691+
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
692+
693693
if (!ZSTR_LEN(sql)) {
694694
RETURN_FALSE;
695695
}
@@ -978,12 +978,12 @@ PHP_METHOD(SQLite3, createFunction)
978978
zend_long flags = 0;
979979
db_obj = Z_SQLITE3_DB_P(object);
980980

981-
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
982-
983981
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sz|ll", &sql_func, &sql_func_len, &callback_func, &sql_func_num_args, &flags) == FAILURE) {
984982
RETURN_THROWS();
985983
}
986984

985+
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
986+
987987
if (!sql_func_len) {
988988
RETURN_FALSE;
989989
}
@@ -1027,12 +1027,12 @@ PHP_METHOD(SQLite3, createAggregate)
10271027
zend_long sql_func_num_args = -1;
10281028
db_obj = Z_SQLITE3_DB_P(object);
10291029

1030-
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
1031-
10321030
if (zend_parse_parameters(ZEND_NUM_ARGS(), "szz|l", &sql_func, &sql_func_len, &step_callback, &fini_callback, &sql_func_num_args) == FAILURE) {
10331031
RETURN_THROWS();
10341032
}
10351033

1034+
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
1035+
10361036
if (!sql_func_len) {
10371037
RETURN_FALSE;
10381038
}
@@ -1083,12 +1083,12 @@ PHP_METHOD(SQLite3, createCollation)
10831083
zval *callback_func;
10841084
db_obj = Z_SQLITE3_DB_P(object);
10851085

1086-
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
1087-
10881086
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sz", &collation_name, &collation_name_len, &callback_func) == FAILURE) {
10891087
RETURN_THROWS();
10901088
}
10911089

1090+
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
1091+
10921092
if (!collation_name_len) {
10931093
RETURN_FALSE;
10941094
}
@@ -1292,8 +1292,6 @@ PHP_METHOD(SQLite3, openBlob)
12921292

12931293
db_obj = Z_SQLITE3_DB_P(object);
12941294

1295-
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
1296-
12971295
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ssl|sl", &table, &table_len, &column, &column_len, &rowid, &dbname, &dbname_len, &flags) == FAILURE) {
12981296
RETURN_THROWS();
12991297
}
@@ -1303,6 +1301,8 @@ PHP_METHOD(SQLite3, openBlob)
13031301
RETURN_THROWS();
13041302
}
13051303

1304+
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
1305+
13061306
sqlite_flags = (flags & SQLITE_OPEN_READWRITE) ? 1 : 0;
13071307

13081308
if (sqlite3_blob_open(db_obj->db, dbname, table, column, rowid, sqlite_flags, &blob) != SQLITE_OK) {
@@ -1360,12 +1360,12 @@ PHP_METHOD(SQLite3, setAuthorizer)
13601360
zend_fcall_info fci;
13611361
zend_fcall_info_cache fcc;
13621362

1363-
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
1364-
13651363
ZEND_PARSE_PARAMETERS_START(1, 1)
13661364
Z_PARAM_FUNC_EX(fci, fcc, 1, 0)
13671365
ZEND_PARSE_PARAMETERS_END();
13681366

1367+
SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
1368+
13691369
/* Clear previously set callback */
13701370
if (ZEND_FCI_INITIALIZED(db_obj->authorizer_fci)) {
13711371
zval_ptr_dtor(&db_obj->authorizer_fci.function_name);
@@ -1398,9 +1398,6 @@ PHP_METHOD(SQLite3, backup)
13981398
sqlite3_backup *dbBackup;
13991399
int rc; // Return code
14001400

1401-
source_obj = Z_SQLITE3_DB_P(source_zval);
1402-
SQLITE3_CHECK_INITIALIZED(source_obj, source_obj->initialised, SQLite3)
1403-
14041401
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|ss", &destination_zval, php_sqlite3_sc_entry, &source_dbname, &source_dbname_length, &destination_dbname, &destination_dbname_length) == FAILURE) {
14051402
RETURN_THROWS();
14061403
}
@@ -1415,6 +1412,9 @@ PHP_METHOD(SQLite3, backup)
14151412
RETURN_THROWS();
14161413
}
14171414

1415+
source_obj = Z_SQLITE3_DB_P(source_zval);
1416+
SQLITE3_CHECK_INITIALIZED(source_obj, source_obj->initialised, SQLite3)
1417+
14181418
destination_obj = Z_SQLITE3_DB_P(destination_zval);
14191419

14201420
SQLITE3_CHECK_INITIALIZED(destination_obj, destination_obj->initialised, SQLite3)
@@ -1957,12 +1957,12 @@ PHP_METHOD(SQLite3Result, numColumns)
19571957
zval *object = ZEND_THIS;
19581958
result_obj = Z_SQLITE3_RESULT_P(object);
19591959

1960-
SQLITE3_CHECK_INITIALIZED(result_obj->db_obj, result_obj->stmt_obj->initialised, SQLite3Result)
1961-
19621960
if (zend_parse_parameters_none() == FAILURE) {
19631961
RETURN_THROWS();
19641962
}
19651963

1964+
SQLITE3_CHECK_INITIALIZED(result_obj->db_obj, result_obj->stmt_obj->initialised, SQLite3Result)
1965+
19661966
RETURN_LONG(sqlite3_column_count(result_obj->stmt_obj->stmt));
19671967
}
19681968
/* }}} */
@@ -1977,11 +1977,12 @@ PHP_METHOD(SQLite3Result, columnName)
19771977
char *column_name;
19781978
result_obj = Z_SQLITE3_RESULT_P(object);
19791979

1980-
SQLITE3_CHECK_INITIALIZED(result_obj->db_obj, result_obj->stmt_obj->initialised, SQLite3Result)
1981-
19821980
if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &column) == FAILURE) {
19831981
RETURN_THROWS();
19841982
}
1983+
1984+
SQLITE3_CHECK_INITIALIZED(result_obj->db_obj, result_obj->stmt_obj->initialised, SQLite3Result)
1985+
19851986
column_name = (char*) sqlite3_column_name(result_obj->stmt_obj->stmt, column);
19861987

19871988
if (column_name == NULL) {
@@ -2001,12 +2002,12 @@ PHP_METHOD(SQLite3Result, columnType)
20012002
zend_long column = 0;
20022003
result_obj = Z_SQLITE3_RESULT_P(object);
20032004

2004-
SQLITE3_CHECK_INITIALIZED(result_obj->db_obj, result_obj->stmt_obj->initialised, SQLite3Result)
2005-
20062005
if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &column) == FAILURE) {
20072006
RETURN_THROWS();
20082007
}
20092008

2009+
SQLITE3_CHECK_INITIALIZED(result_obj->db_obj, result_obj->stmt_obj->initialised, SQLite3Result)
2010+
20102011
if (!sqlite3_data_count(result_obj->stmt_obj->stmt)) {
20112012
RETURN_FALSE;
20122013
}
@@ -2025,12 +2026,12 @@ PHP_METHOD(SQLite3Result, fetchArray)
20252026
zend_long mode = PHP_SQLITE3_BOTH;
20262027
result_obj = Z_SQLITE3_RESULT_P(object);
20272028

2028-
SQLITE3_CHECK_INITIALIZED(result_obj->db_obj, result_obj->stmt_obj->initialised, SQLite3Result)
2029-
20302029
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &mode) == FAILURE) {
20312030
RETURN_THROWS();
20322031
}
20332032

2033+
SQLITE3_CHECK_INITIALIZED(result_obj->db_obj, result_obj->stmt_obj->initialised, SQLite3Result)
2034+
20342035
ret = sqlite3_step(result_obj->stmt_obj->stmt);
20352036
switch (ret) {
20362037
case SQLITE_ROW:
@@ -2079,12 +2080,12 @@ PHP_METHOD(SQLite3Result, reset)
20792080
zval *object = ZEND_THIS;
20802081
result_obj = Z_SQLITE3_RESULT_P(object);
20812082

2082-
SQLITE3_CHECK_INITIALIZED(result_obj->db_obj, result_obj->stmt_obj->initialised, SQLite3Result)
2083-
20842083
if (zend_parse_parameters_none() == FAILURE) {
20852084
RETURN_THROWS();
20862085
}
20872086

2087+
SQLITE3_CHECK_INITIALIZED(result_obj->db_obj, result_obj->stmt_obj->initialised, SQLite3Result)
2088+
20882089
if (sqlite3_reset(result_obj->stmt_obj->stmt) != SQLITE_OK) {
20892090
RETURN_FALSE;
20902091
}
@@ -2101,12 +2102,12 @@ PHP_METHOD(SQLite3Result, finalize)
21012102
zval *object = ZEND_THIS;
21022103
result_obj = Z_SQLITE3_RESULT_P(object);
21032104

2104-
SQLITE3_CHECK_INITIALIZED(result_obj->db_obj, result_obj->stmt_obj->initialised, SQLite3Result)
2105-
21062105
if (zend_parse_parameters_none() == FAILURE) {
21072106
RETURN_THROWS();
21082107
}
21092108

2109+
SQLITE3_CHECK_INITIALIZED(result_obj->db_obj, result_obj->stmt_obj->initialised, SQLite3Result)
2110+
21102111
/* We need to finalize an internal statement */
21112112
if (result_obj->is_prepared_statement == 0) {
21122113
zend_llist_del_element(&(result_obj->db_obj->free_list), &result_obj->stmt_obj_zval,

0 commit comments

Comments
 (0)