Skip to content

FIX: S360 Resolve [CodeQL.SM02986] 'Cast from char* to wchar_t* #309

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

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
+13 −8
Open

FIX: S360 Resolve [CodeQL.SM02986] 'Cast from char* to wchar_t* #309

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
752f336
suppressing false warnings
gargsaumya Oct 30, 2025
8d7d173
pushing the fix
gargsaumya Oct 30, 2025
2114446
Merge branch 'main' into saumya/s360
gargsaumya Nov 4, 2025
056d806
Merge branch 'main' into saumya/s360
gargsaumya Nov 5, 2025
f7565f3
Merge branch 'main' into saumya/s360
gargsaumya Nov 6, 2025
1322bb1
Merge branch 'main' into saumya/s360
gargsaumya Nov 6, 2025
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
21 changes: 13 additions & 8 deletions mssql_python/pybind/ddbc_bindings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "connection/connection_pool.h"

#include <cstdint>
#include <cstring> // For std::memcpy
#include <iomanip> // std::setw, std::setfill
#include <iostream>
#include <utility> // std::forward
Expand Down Expand Up @@ -2463,10 +2464,11 @@ static py::object FetchLobColumnData(SQLHSTMT hStmt,
} else {
// Wide characters
size_t wcharSize = sizeof(SQLWCHAR);
if (bytesRead >= wcharSize) {
auto sqlwBuf = reinterpret_cast<const SQLWCHAR*>(chunk.data());
if (bytesRead >= wcharSize && (bytesRead % wcharSize == 0)) {
size_t wcharCount = bytesRead / wcharSize;
while (wcharCount > 0 && sqlwBuf[wcharCount - 1] == 0) {
std::vector<SQLWCHAR> alignedBuf(wcharCount);
std::memcpy(alignedBuf.data(), chunk.data(), bytesRead);
while (wcharCount > 0 && alignedBuf[wcharCount - 1] == 0) {
--wcharCount;
bytesRead -= wcharSize;
}
Expand Down Expand Up @@ -2495,14 +2497,18 @@ static py::object FetchLobColumnData(SQLHSTMT hStmt,
}
if (isWideChar) {
#if defined(_WIN32)
std::wstring wstr(reinterpret_cast<const wchar_t*>(buffer.data()), buffer.size() / sizeof(wchar_t));
size_t wcharCount = buffer.size() / sizeof(wchar_t);
Copy link
Collaborator

@bewithgaurav bewithgaurav Nov 4, 2025

Choose a reason for hiding this comment

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

can we add some comments around the changes? also, can add a pointer referencing a small description of the s360 issue.

std::vector<wchar_t> alignedBuf(wcharCount);
std::memcpy(alignedBuf.data(), buffer.data(), buffer.size());
std::wstring wstr(alignedBuf.data(), wcharCount);
std::string utf8str = WideToUTF8(wstr);
return py::str(utf8str);
#else
// Linux/macOS handling
size_t wcharCount = buffer.size() / sizeof(SQLWCHAR);
const SQLWCHAR* sqlwBuf = reinterpret_cast<const SQLWCHAR*>(buffer.data());
std::wstring wstr = SQLWCHARToWString(sqlwBuf, wcharCount);
std::vector<SQLWCHAR> alignedBuf(wcharCount);
std::memcpy(alignedBuf.data(), buffer.data(), buffer.size());
std::wstring wstr = SQLWCHARToWString(alignedBuf.data(), wcharCount);
std::string utf8str = WideToUTF8(wstr);
return py::str(utf8str);
#endif
Expand Down Expand Up @@ -2623,8 +2629,7 @@ SQLRETURN SQLGetData_wrap(SqlHandlePtr StatementHandle, SQLUSMALLINT colCount, p
uint64_t numCharsInData = dataLen / sizeof(SQLWCHAR);
if (numCharsInData < dataBuffer.size()) {
#if defined(__APPLE__) || defined(__linux__)
const SQLWCHAR* sqlwBuf = reinterpret_cast<const SQLWCHAR*>(dataBuffer.data());
std::wstring wstr = SQLWCHARToWString(sqlwBuf, numCharsInData);
std::wstring wstr = SQLWCHARToWString(dataBuffer.data(), numCharsInData);
std::string utf8str = WideToUTF8(wstr);
row.append(py::str(utf8str));
#else
Expand Down