Skip to content

Fix SIGSEGV in SQLCopyDesc when source descriptor is empty #297

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
irodushka merged 1 commit into from
May 14, 2026
Merged

Fix SIGSEGV in SQLCopyDesc when source descriptor is empty #297

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
3 changes: 2 additions & 1 deletion OdbcDesc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,8 @@ SQLRETURN OdbcDesc::operator =(OdbcDesc &sour)

for ( int n = 0 ; n <= headCount ; n++ )
{
DescRecord *srcrec = sour.records[n];
// sour.records is NULL for an empty source — guard like the other loops in this file.
DescRecord *srcrec = sour.records ? sour.records[n] : NULL;
DescRecord &rec = *getDescRecord ( n );

if ( srcrec )
Expand Down
3 changes: 0 additions & 3 deletions tests/test_phase7_crusher_fixes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
class CopyDescCrashTest : public OdbcConnectedTest {};

TEST_F(CopyDescCrashTest, CopyEmptyARDDoesNotCrash) {
GTEST_SKIP() << "Requires Phase 7: ODBC Crusher-identified bug fixes (not yet merged)";
// Allocate two statements with no bindings (empty ARDs)
SQLHSTMT stmt1 = AllocExtraStmt();
SQLHSTMT stmt2 = AllocExtraStmt();
Expand Down Expand Up @@ -49,7 +48,6 @@ TEST_F(CopyDescCrashTest, CopyEmptyARDDoesNotCrash) {
}

TEST_F(CopyDescCrashTest, CopyEmptyToExplicitDescriptor) {
GTEST_SKIP() << "Requires Phase 7: ODBC Crusher-identified bug fixes (not yet merged)";
// Allocate an explicit descriptor
SQLHDESC hExplicit = SQL_NULL_HDESC;
SQLRETURN ret = SQLAllocHandle(SQL_HANDLE_DESC, hDbc, &hExplicit);
Expand All @@ -70,7 +68,6 @@ TEST_F(CopyDescCrashTest, CopyEmptyToExplicitDescriptor) {
}

TEST_F(CopyDescCrashTest, CopyPopulatedThenEmpty) {
GTEST_SKIP() << "Requires Phase 7: ODBC Crusher-identified bug fixes (not yet merged)";
// First, populate an explicit descriptor by copying a populated ARD
SQLINTEGER val = 0;
SQLLEN ind = 0;
Expand Down