Skip to content

dbwritetext: Fail if dbconvert does. #577

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

Closed
ucko wants to merge 1 commit into from
Closed

dbwritetext: Fail if dbconvert does. #577

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
11 changes: 9 additions & 2 deletions src/dblib/dblib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6634,6 +6634,7 @@ RETCODE
dbwritetext(DBPROCESS * dbproc, char *objname, DBBINARY * textptr, DBTINYINT textptrlen, DBBINARY * timestamp, DBBOOL log,
DBINT size, BYTE * text)
{
DBINT len = 0;
char textptr_string[35]; /* 16 * 2 + 2 (0x) + 1 */
char timestamp_string[19]; /* 8 * 2 + 2 (0x) + 1 */
TDS_INT result_type;
Expand All @@ -6652,8 +6653,14 @@ dbwritetext(DBPROCESS * dbproc, char *objname, DBBINARY * textptr, DBTINYINT tex
if (textptrlen > DBTXPLEN)
return FAIL;

dbconvert(dbproc, SYBBINARY, (BYTE *) textptr, textptrlen, SYBCHAR, (BYTE *) textptr_string, -1);
dbconvert(dbproc, SYBBINARY, (BYTE *) timestamp, 8, SYBCHAR, (BYTE *) timestamp_string, -1);
len = dbconvert(dbproc, SYBBINARY, (BYTE *) textptr, textptrlen,
SYBCHAR, (BYTE *) textptr_string, -1);
if (len < 0)
return FAIL;
len = dbconvert(dbproc, SYBBINARY, (BYTE *) timestamp, 8, SYBCHAR,
(BYTE *) timestamp_string, -1);
if (len < 0)
return FAIL;
Comment on lines +6656 to +6663
Copy link
Contributor

@freddy77 freddy77 May 30, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But this function cannot fail with these arguments!


dbproc->dbresults_state = _DB_RES_INIT;

Expand Down