Skip to content

make sure we check for errors in convert_to_pgbinary instead of ignorng return value of -1 from pg_bin2hex #150

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

Merged
davecramer merged 1 commit into from
Dec 24, 2025
Merged

make sure we check for errors in convert_to_pgbinary instead of ignorng return value of -1 from pg_bin2hex #150

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
23 changes: 19 additions & 4 deletions convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2424,16 +2424,28 @@ enlarge_query_statement(QueryBuild *qb, size_t newsize)
#define CVT_APPEND_BINARY(qb, buf, used) \
do { \
size_t newlimit; \
SQLLEN result; \
\
newlimit = (qb)->npos; \
if (qb->flags & FLGB_HEX_BIN_FORMAT) \
newlimit += 2 * used + 4; \
else \
newlimit += 5 * used; \
ENLARGE_NEWSTATEMENT(qb, newlimit); \
(qb)->npos += convert_to_pgbinary(buf, \
&qb->query_statement[(qb)->npos], \
used, qb); \
result = convert_to_pgbinary(buf, \
&qb->query_statement[(qb)->npos], \
used, qb); \
if (result == -1) { \
if (qb->stmt) \
SC_set_error(qb->stmt, STMT_EXEC_ERROR, \
"Binary conversion failed", __func__); \
else { \
qb->errormsg = "Binary conversion failed"; \
qb->errornumber = STMT_EXEC_ERROR; \
} \
break; \
} \
(qb)->npos += result; \
} while (0)

/*----------
Expand Down Expand Up @@ -6313,6 +6325,7 @@ convert_to_pgbinary(const char *in, char *out, size_t len, QueryBuild *qb)
char escape_in_literal = CC_get_escape(qb->conn);
BOOL esc_double = (qb->param_mode != RPM_BUILDING_BIND_REQUEST &&
0 != escape_in_literal);
SQLLEN hex;

/* use hex format for 9.0 or later servers */
if (0 != (qb->flags & FLGB_HEX_BIN_FORMAT))
Expand All @@ -6321,7 +6334,9 @@ convert_to_pgbinary(const char *in, char *out, size_t len, QueryBuild *qb)
out[o++] = escape_in_literal;
out[o++] = '\\';
out[o++] = 'x';
o += pg_bin2hex(in, out + o, len);
hex = pg_bin2hex(in, out + o, len);
if (hex == -1) return hex;
o += hex;
return o;
}
for (i = 0; i < len; i++)
Expand Down