mirror of https://github.com/sysown/proxysql
Merge pull request #5142 from sysown/v3.0_bind_fmt_bug_fix_5140
Fixed: Invalid UTF-8 byte sequence error (0xff) when relaying text parameter followed by null parameter [Extended Query]pull/5161/head
Keith Brings
6 months ago
committed by
GitHub
commit
aaefac0ca4
@ -0,0 +1,22 @@
|
||||
diff --git src/interfaces/libpq/fe-exec.c src/interfaces/libpq/fe-exec.c
|
||||
index d572bde..99bab2c 100644
|
||||
--- src/interfaces/libpq/fe-exec.c
|
||||
+++ src/interfaces/libpq/fe-exec.c
|
||||
@@ -1855,8 +1855,15 @@ PQsendQueryGuts(PGconn *conn,
|
||||
}
|
||||
else
|
||||
{
|
||||
- /* text parameter, do not use paramLengths */
|
||||
- nbytes = strlen(paramValues[i]);
|
||||
+ /* text parameter */
|
||||
+ if (paramLengths && paramLengths[i] >= 0)
|
||||
+ {
|
||||
+ nbytes = paramLengths[i]; // use supplied length
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ nbytes = strlen(paramValues[i]); // fallback to strlen
|
||||
+ }
|
||||
}
|
||||
if (pqPutInt(nbytes, 4, conn) < 0 ||
|
||||
pqPutnchar(paramValues[i], nbytes, conn) < 0)
|
||||
@ -0,0 +1,143 @@
|
||||
/**
|
||||
* @file pgsql-reg_test_5140_bind_param_fmt_mix-t.cpp
|
||||
* @brief Regression test to check libpq's handling of mixed text and binary parameter.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <unistd.h>
|
||||
#include <string>
|
||||
#include <sstream>
|
||||
#include <chrono>
|
||||
#include <thread>
|
||||
#include <mutex>
|
||||
#include <condition_variable>
|
||||
#include "libpq-fe.h"
|
||||
#include "command_line.h"
|
||||
#include "tap.h"
|
||||
#include "utils.h"
|
||||
|
||||
CommandLine cl;
|
||||
|
||||
using PGConnPtr = std::unique_ptr<PGconn, decltype(&PQfinish)>;
|
||||
|
||||
enum ConnType {
|
||||
ADMIN,
|
||||
BACKEND
|
||||
};
|
||||
|
||||
PGConnPtr createNewConnection(ConnType conn_type, const std::string& options = "", bool with_ssl = false) {
|
||||
|
||||
const char* host = (conn_type == BACKEND) ? cl.pgsql_host : cl.pgsql_admin_host;
|
||||
int port = (conn_type == BACKEND) ? cl.pgsql_port : cl.pgsql_admin_port;
|
||||
const char* username = (conn_type == BACKEND) ? cl.pgsql_username : cl.admin_username;
|
||||
const char* password = (conn_type == BACKEND) ? cl.pgsql_password : cl.admin_password;
|
||||
|
||||
std::stringstream ss;
|
||||
|
||||
ss << "host=" << host << " port=" << port;
|
||||
ss << " user=" << username << " password=" << password;
|
||||
ss << (with_ssl ? " sslmode=require" : " sslmode=disable");
|
||||
|
||||
if (options.empty() == false) {
|
||||
ss << " options='" << options << "'";
|
||||
}
|
||||
|
||||
PGconn* conn = PQconnectdb(ss.str().c_str());
|
||||
if (PQstatus(conn) != CONNECTION_OK) {
|
||||
fprintf(stderr, "Connection failed to '%s': %s", (conn_type == BACKEND ? "Backend" : "Admin"), PQerrorMessage(conn));
|
||||
PQfinish(conn);
|
||||
return PGConnPtr(nullptr, &PQfinish);
|
||||
}
|
||||
return PGConnPtr(conn, &PQfinish);
|
||||
}
|
||||
|
||||
int main(int argc, char** argv) {
|
||||
|
||||
if (cl.getEnv())
|
||||
return exit_status();
|
||||
|
||||
plan(4);
|
||||
|
||||
auto conn = createNewConnection(BACKEND);
|
||||
if (!conn) {
|
||||
diag("connection failed");
|
||||
return 1;
|
||||
}
|
||||
|
||||
// Ensure we have a test table
|
||||
PGresult* res = PQexec(conn.get(),
|
||||
"CREATE TEMP TABLE reg_test_5140 (col1 text,col2 int, col3 text, col4 text)"
|
||||
);
|
||||
if (PQresultStatus(res) != PGRES_COMMAND_OK) {
|
||||
diag("Error: %s", PQerrorMessage(conn.get()));
|
||||
PQclear(res);
|
||||
return 1;
|
||||
}
|
||||
PQclear(res);
|
||||
|
||||
// Prepare a statement with 4 parameters
|
||||
res = PQprepare(conn.get(), "stmt_test_bind_5140",
|
||||
"INSERT INTO reg_test_5140 VALUES ($1, $2, $3, $4)", 4, nullptr);
|
||||
if (PQresultStatus(res) != PGRES_COMMAND_OK) {
|
||||
diag("Error: %s", PQerrorMessage(conn.get()));
|
||||
PQclear(res);
|
||||
return 1;
|
||||
}
|
||||
PQclear(res);
|
||||
|
||||
// Parameter values:
|
||||
// col1 = "ABCDEFGHIJKLMN" (length 14)
|
||||
// col2 = NULL (-1)
|
||||
// col3 = empty string (length 0)
|
||||
// col4 = binary data (length 0)
|
||||
const char* values[4];
|
||||
int lengths[4];
|
||||
int formats[4];
|
||||
|
||||
values[0] = "ABCDEFGHIJKLMN"; // 14 chars
|
||||
lengths[0] = 14;
|
||||
formats[0] = 0; // Text Format
|
||||
|
||||
values[1] = nullptr; // NULL
|
||||
lengths[1] = -1;
|
||||
formats[1] = 1; // Binary Format
|
||||
|
||||
values[2] = ""; // empty string
|
||||
lengths[2] = 0;
|
||||
formats[2] = 0; // Text Format
|
||||
|
||||
values[3] = ""; // empty binary
|
||||
lengths[3] = 0;
|
||||
formats[3] = 1; // Binary Format
|
||||
|
||||
res = PQexecPrepared(conn.get(), "stmt_test_bind_5140", 4, values, lengths, formats, 0);
|
||||
if (PQresultStatus(res) != PGRES_COMMAND_OK) {
|
||||
diag("Error: %s", PQerrorMessage(conn.get()));
|
||||
PQclear(res);
|
||||
return 1;
|
||||
}
|
||||
PQclear(res);
|
||||
|
||||
// Verify row inserted as expected
|
||||
res = PQexec(conn.get(), "SELECT col1, col2, col3, col4 FROM reg_test_5140");
|
||||
if (PQresultStatus(res) != PGRES_TUPLES_OK) {
|
||||
diag("Error: %s", PQerrorMessage(conn.get()));
|
||||
PQclear(res);
|
||||
return 1;
|
||||
}
|
||||
|
||||
char const* c1 = PQgetvalue(res, 0, 0);
|
||||
bool isnull_c2 = PQgetisnull(res, 0, 1);
|
||||
char const* c3 = PQgetvalue(res, 0, 2);
|
||||
bool isnull_c4 = PQgetisnull(res, 0, 3);
|
||||
int len_c4 = PQgetlength(res, 0, 3);
|
||||
|
||||
ok(std::string(c1) == "ABCDEFGHIJKLMN", "col1 length 14 parsed correctly");
|
||||
ok(isnull_c2, "col2 NULL parsed correctly");
|
||||
ok(std::string(c3) == "", "col3 empty string parsed correctly");
|
||||
ok(!isnull_c4 && len_c4 == 0, "col4 empty binary parsed correctly");
|
||||
|
||||
PQclear(res);
|
||||
|
||||
return exit_status();
|
||||
}
|
||||
Loading…
Reference in new issue