-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix handling the output conn str buff if too small (#194)
If the application provides an output buffer for the constructed connection string, the driver will currently return an error and thus fail the connection. The correct handling is however to apply truncation but return the number of characters available without trunctation. This commit works around swprintf() returning an error code, but otherwise correctly 0-terminating the destination buffer and not setting the errno. (cherry picked from commit ef5dccb)
- Loading branch information
Showing
7 changed files
with
158 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License; | ||
| * you may not use this file except in compliance with the Elastic License. | ||
| */ | ||
|
|
||
| #include <gtest/gtest.h> | ||
| #include "connected_dbc.h" | ||
|
|
||
| namespace test { | ||
|
|
||
| class DriverConnect : public ::testing::Test, public ConnectedDBC | ||
| { | ||
| protected: | ||
| cstr_st types = {0}; | ||
| SQLHANDLE my_dbc; | ||
| SQLSMALLINT out_avail = -1; | ||
|
|
||
| void SetUp() override | ||
| { | ||
| ret = SQLAllocHandle(SQL_HANDLE_DBC, env, &my_dbc); | ||
| ASSERT_TRUE(SQL_SUCCEEDED(ret)); | ||
|
|
||
| types.str = (SQLCHAR *)strdup(SYSTYPES_ANSWER); | ||
| ASSERT_TRUE(types.str != NULL); | ||
| types.cnt = sizeof(SYSTYPES_ANSWER) - 1; | ||
| } | ||
|
|
||
| void TearDown() override | ||
| { | ||
| ret = SQLFreeHandle(SQL_HANDLE_DBC, my_dbc); | ||
| ASSERT_TRUE(SQL_SUCCEEDED(ret)); | ||
| } | ||
| }; | ||
|
|
||
| TEST_F(DriverConnect, OutputCount) | ||
| { | ||
| ret = SQLDriverConnect(my_dbc, (SQLHWND)&types, (SQLWCHAR *)CONNECT_STRING, | ||
| sizeof(CONNECT_STRING) / sizeof(CONNECT_STRING[0]) - 1, NULL, 0, | ||
| &out_avail, ESODBC_SQL_DRIVER_TEST); | ||
| ASSERT_TRUE(SQL_SUCCEEDED(ret)); | ||
| ASSERT_TRUE(0 < out_avail); | ||
| } | ||
|
|
||
| TEST_F(DriverConnect, OutputZeroTerm) | ||
| { | ||
| static const size_t buff_sz = 1024; | ||
| SQLWCHAR out_buff[buff_sz]; | ||
|
|
||
| ret = SQLDriverConnect(my_dbc, (SQLHWND)&types, (SQLWCHAR *)CONNECT_STRING, | ||
| sizeof(CONNECT_STRING) / sizeof(CONNECT_STRING[0]) - 1, | ||
| out_buff, buff_sz, &out_avail, ESODBC_SQL_DRIVER_TEST); | ||
| ASSERT_TRUE(SQL_SUCCEEDED(ret)); | ||
| ASSERT_TRUE(out_avail < buff_sz); | ||
| ASSERT_EQ(out_buff[out_avail], (SQLWCHAR)L'\0'); | ||
|
|
||
| } | ||
|
|
||
| TEST_F(DriverConnect, OutputTruncated) | ||
| { | ||
| static const size_t buff_sz = 3; | ||
| SQLWCHAR out_buff[buff_sz]; | ||
|
|
||
| ret = SQLDriverConnect(my_dbc, (SQLHWND)&types, (SQLWCHAR *)CONNECT_STRING, | ||
| sizeof(CONNECT_STRING) / sizeof(CONNECT_STRING[0]) - 1, | ||
| out_buff, buff_sz, &out_avail, ESODBC_SQL_DRIVER_TEST); | ||
| ASSERT_TRUE(SQL_SUCCEEDED(ret)); | ||
| ASSERT_TRUE(buff_sz < out_avail); | ||
| ASSERT_EQ(out_buff[buff_sz - 1], (SQLWCHAR)L'\0'); | ||
|
|
||
| } | ||
|
|
||
| } // test namespace | ||
|
|