simcop2387/DBD-SQLite-SQLcipher
1
0
Fork 0
mirror of https://github.com/DBD-SQLite/DBD-SQLite synced 2025-06-07 22:28:47 -04:00
Code Issues Releases Wiki Activity

check SvPOK before using SvPV

Browse source
This commit is contained in:
Kenichi Ishigaki 2012-09-03 04:24:16 +00:00
parent 82c93604ff
commit d0cad62012
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dbdimp.c
View file

@ -1420,11 +1420,11 @@ HV* sqlite_db_table_column_metadata(pTHX_ SV *dbh, SV *dbname, SV *tablename, SV
HV *metadata = newHV(); HV *metadata = newHV();
/* dbname may be NULL but (table|column)name may not be NULL */ /* dbname may be NULL but (table|column)name may not be NULL */
if (!tablename) { if (!tablename || !SvPOK(tablename)) {
sqlite_error(dbh, -2, "table_column_metadata requires a table name"); sqlite_error(dbh, -2, "table_column_metadata requires a table name");
return FALSE; return FALSE;
} }
if (!columnname) { if (!columnname || !SvPOK(columnname)) {
sqlite_error(dbh, -2, "table_column_metadata requires a column name"); sqlite_error(dbh, -2, "table_column_metadata requires a column name");
return FALSE; return FALSE;
} }
@ -1432,7 +1432,7 @@ HV* sqlite_db_table_column_metadata(pTHX_ SV *dbh, SV *dbname, SV *tablename, SV
#ifdef SQLITE_ENABLE_COLUMN_METADATA #ifdef SQLITE_ENABLE_COLUMN_METADATA
int rc = sqlite3_table_column_metadata( int rc = sqlite3_table_column_metadata(
imp_dbh->db, imp_dbh->db,
dbname ? SvPV_nolen(dbname) : NULL, (dbname && SvPOK(dbname)) ? SvPV_nolen(dbname) : NULL,
SvPV_nolen(tablename), SvPV_nolen(tablename),
SvPV_nolen(columnname), SvPV_nolen(columnname),
&datatype, &collseq, &notnull, &primary, &autoinc); &datatype, &collseq, &notnull, &primary, &autoinc);