Skip to content

cs_convert, dbconvert: Truncate data as needed. #573

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

cs_convert, dbconvert: Truncate data as needed. #573

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
9 changes: 4 additions & 5 deletions src/ctlib/cs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,14 +592,14 @@ _cs_convert(CS_CONTEXT * ctx, const CS_DATAFMT_COMMON * srcfmt, CS_VOID * srcdat
case SYBBINARY:
case SYBVARBINARY:
case SYBIMAGE:
memcpy(dest, srcdata, src_len);
*resultlen = src_len;
memcpy(dest, srcdata, minlen);
*resultlen = minlen;

if (src_len > destlen) {
tdsdump_log(TDS_DBG_FUNC, "error: src_len > destlen\n");
_csclient_msg(ctx, "cs_convert", 2, 4, 1, 36, "");
ret = CS_FAIL;
} else {
src_len = destlen;
} /* else */ {
switch (destfmt->format) {
case CS_FMT_PADNULL:
memset(dest + src_len, '\0', destlen - src_len);
Expand Down Expand Up @@ -829,7 +829,6 @@ _cs_convert(CS_CONTEXT * ctx, const CS_DATAFMT_COMMON * srcfmt, CS_VOID * srcdat
tdsdump_log(TDS_DBG_FUNC, "Data-conversion resulted in overflow\n");
_csclient_msg(ctx, "cs_convert", 2, 4, 1, 36, "");
len = destlen;
ret = CS_FAIL;
}
switch (destfmt->format) {

Expand Down
6 changes: 4 additions & 2 deletions src/ctlib/unittests/cs_convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,11 +296,13 @@ main(void)
DO_TEST(CS_INT test = 1234567;
CS_CHAR test2[] = "1234567", CS_INT_TYPE, &test, sizeof(test), CS_CHAR_TYPE, 7, CS_SUCCEED, test2, 7);
DO_TEST(CS_CHAR test[] = "abc";
CS_CHAR test2[] = "ab", CS_CHAR_TYPE, test, 3, CS_CHAR_TYPE, 2, CS_FAIL, test2, 2);
CS_CHAR test2[] = "ab", CS_CHAR_TYPE, test, 3, CS_CHAR_TYPE, 2,
CS_SUCCEED /* CS_FAIL */, test2, 2);
Comment on lines -299 to +300
Copy link
Copy Markdown
Contributor

@freddy77 freddy77 Jun 2, 2024

Choose a reason for hiding this comment

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

I think these tests are checked against proprietary libraries. That is you are introducing a bug.

Copy link
Copy Markdown
Contributor Author

@ucko ucko Jun 4, 2024

Choose a reason for hiding this comment

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

Ah, yeah, looks like such truncation should occur only in the context of bulk insertion (where it does happen with proprietary libraries).

DO_TEST(CS_CHAR test[] = "abc";
CS_CHAR test2[] = "616263", CS_BINARY_TYPE, test, 3, CS_CHAR_TYPE, 6, CS_SUCCEED, test2, 6);
DO_TEST(CS_CHAR test[] = "abcdef";
CS_CHAR test2[] = "616263", CS_BINARY_TYPE, test, 6, CS_CHAR_TYPE, 6, CS_FAIL, test2, 6);
CS_CHAR test2[] = "616263", CS_BINARY_TYPE, test, 6,
CS_CHAR_TYPE, 6, CS_SUCCEED /* CS_FAIL */, test2, 6);

/* conversion to various binaries */
DO_TEST(CS_CHAR test[] = "616263646566";
Expand Down
12 changes: 10 additions & 2 deletions src/dblib/dblib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2422,10 +2422,14 @@ dbconvert_ps(DBPROCESS * dbproc, int db_srctype, const BYTE * src, DBINT srclen,
break;
default:
assert(destlen > 0);
if (destlen < 0 || srclen > destlen) {
if (destlen < 0) {
dbperror(dbproc, SYBECOFL, 0);
ret = -1;
} else {
if (srclen > destlen) {
dbperror(dbproc, 50000, 0);
srclen = destlen;
}
memcpy(dest, src, srclen);
if (srclen < destlen)
memset(dest + srclen, ' ', destlen - srclen);
Expand Down Expand Up @@ -2560,13 +2564,17 @@ dbconvert_ps(DBPROCESS * dbproc, int db_srctype, const BYTE * src, DBINT srclen,
break;
default:
assert(destlen > 0);
if (destlen < 0 || len > destlen) {
if (destlen < 0) {
dbperror(dbproc, SYBECOFL, 0);
ret = -1;
tdsdump_log(TDS_DBG_INFO1, "%d bytes type %d -> %d, destlen %d < %d required\n",
srclen, srctype, desttype, destlen, len);
break;
}
if (len > destlen) {
dbperror(dbproc, 50000, 0);
len = destlen;
}
/* else pad with blanks */
memcpy(dest, dres.c, len);
if (len < destlen)
Expand Down
6 changes: 4 additions & 2 deletions src/dblib/unittests/t0019.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,10 @@ main(void)
TEST((SYBCHAR, "ciao\0\0", 6, SYBCHAR, -1), "len=6 63 69 61 6F 00 00 00 2A 2A 2A");
TEST((SYBCHAR, "ciao ", 6, SYBCHAR, 8), "len=6 63 69 61 6F 20 20 20 20 2A 2A");
TEST((SYBCHAR, "ciao\0\0", 6, SYBCHAR, 8), "len=6 63 69 61 6F 00 00 20 20 2A 2A");
TEST((SYBCHAR, "ciao ", 6, SYBCHAR, 4), "error");
TEST((SYBCHAR, "ciao\0\0", 6, SYBCHAR, 4), "error");
TEST((SYBCHAR, "ciao ", 6, SYBCHAR, 4),
"len=4 63 69 61 6F 2A 2A 2A 2A 2A 2A" /* "error" */);
TEST((SYBCHAR, "ciao\0\0", 6, SYBCHAR, 4),
"len=4 63 69 61 6F 2A 2A 2A 2A 2A 2A" /* "error" */);
TEST((SYBCHAR, "ciao ", 6, SYBCHAR, 6), "len=6 63 69 61 6F 20 20 2A 2A 2A 2A");
TEST((SYBCHAR, "ciao\0\0", 6, SYBCHAR, 6), "len=6 63 69 61 6F 00 00 2A 2A 2A 2A");

Expand Down