summaryrefslogtreecommitdiff
path: root/ext/sqlite3/sqlite3.c
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2015-07-07 21:38:24 +0800
committerXinchen Hui <laruence@php.net>2015-07-07 21:38:24 +0800
commitca1ba39102d3e209d4c8a04b46316e9c8b7521e4 (patch)
tree77bfce47da72370aa1d4bf9f00d58560e9b722d0 /ext/sqlite3/sqlite3.c
parent5bd315657c41601803bf5cf2528fdd373fdfdf48 (diff)
parent26471eb69c3cd9e8162ff3b398d33919d9075191 (diff)
downloadphp-git-ca1ba39102d3e209d4c8a04b46316e9c8b7521e4.tar.gz
Merge branch 'PHP-5.6'
Conflicts: ext/sqlite3/sqlite3.c
Diffstat (limited to 'ext/sqlite3/sqlite3.c')
-rw-r--r--ext/sqlite3/sqlite3.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
index eacd66399e..b16cba3668 100644
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@ -281,7 +281,11 @@ PHP_METHOD(sqlite3, lastErrorCode)
return;
}
- RETURN_LONG(sqlite3_errcode(db_obj->db));
+ if (db_obj->initialised) {
+ RETURN_LONG(sqlite3_errcode(db_obj->db));
+ } else {
+ RETURN_LONG(0);
+ }
}
/* }}} */
@@ -299,7 +303,11 @@ PHP_METHOD(sqlite3, lastErrorMsg)
return;
}
- RETVAL_STRING((char *)sqlite3_errmsg(db_obj->db));
+ if (db_obj->initialised) {
+ RETURN_STRING((char *)sqlite3_errmsg(db_obj->db));
+ } else {
+ RETURN_EMPTY_STRING();
+ }
}
/* }}} */