Skip to content

Ensure C-string arguments from string_views are null-terminated #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wandernauta wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Ensure C-string arguments from string_views are null-terminated #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion minipsql.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ using namespace std;

MiniPSQL::MiniPSQL(std::string_view fname)
{
d_conn = PQconnectdb(&fname[0]);
d_conn = PQconnectdb(string(fname).c_str());
if (PQstatus(d_conn) != CONNECTION_OK) {
throw std::runtime_error("Error connecting to postgresql: "+ string(PQerrorMessage(d_conn)));
}
Expand Down
6 changes: 3 additions & 3 deletions sqlwriter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MiniSQLite::MiniSQLite(std::string_view fname, SQLWFlag flag)
else
flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE;

if ( sqlite3_open_v2(&fname[0], &d_sqlite, flags, 0)!=SQLITE_OK) {
if (sqlite3_open_v2(string(fname).c_str(), &d_sqlite, flags, 0) != SQLITE_OK) {
throw runtime_error("Unable to open "+(string)fname+" for sqlite");
}
sqlite3_extended_result_codes(d_sqlite, 1);
Expand Down Expand Up @@ -55,7 +55,7 @@ vector<vector<string>> MiniSQLite::exec(std::string_view str)
std::string errstr;
// int (*callback)(void*,int,char**,char**)
d_rows.clear();
int rc = sqlite3_exec(d_sqlite, &str[0], helperFunc, this, &errmsg);
int rc = sqlite3_exec(d_sqlite, string(str).c_str(), helperFunc, this, &errmsg);
if (rc != SQLITE_OK) {
errstr = errmsg;
sqlite3_free(errmsg);
Expand Down Expand Up @@ -96,7 +96,7 @@ void MiniSQLite::prepare(const std::string& table, string_view str)
}
const char* pTail;

if (sqlite3_prepare_v2(d_sqlite, &str[0], -1, &d_stmts[table], &pTail ) != SQLITE_OK) {
if (sqlite3_prepare_v2(d_sqlite, str.data(), (int)str.size(), &d_stmts[table], &pTail) != SQLITE_OK) {
throw runtime_error("Unable to prepare query "+(string)str + ": "+sqlite3_errmsg(d_sqlite));
}
}
Expand Down