Skip to content

Fix possible UB #150

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
mrts merged 1 commit into from
Nov 9, 2026
Merged

Fix possible UB #150

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
8 changes: 0 additions & 8 deletions lib/libpcsc-cpp/include/pcsc-cpp/comp_winscard.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@
#undef IGNORE
#endif

#ifdef __APPLE__
#pragma pack(1)
#else
#pragma pack(push, 1)
#endif

#ifndef SCARD_CTL_CODE
#define SCARD_CTL_CODE(code) (0x42000000 + (code))
Expand Down Expand Up @@ -129,8 +125,4 @@ struct PIN_VERIFY_STRUCTURE
uint32_t ulDataLength; // length of Data to be sent to the ICC
};

#ifdef __APPLE__
#pragma pack()
#else
#pragma pack(pop)
#endif
17 changes: 10 additions & 7 deletions lib/libpcsc-cpp/src/SmartCard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ class CardImpl

if (auto ioctl = feature(FEATURE_GET_TLV_PROPERTIES); ioctl != features.cend()) {
std::array<BYTE, 256> buf {};
SCard(Control, cardHandle, ioctl->value, nullptr, 0U, buf.data(), DWORD(buf.size()),
const DWORD controlCode = ioctl->value;
SCard(Control, cardHandle, controlCode, nullptr, 0U, buf.data(), DWORD(buf.size()),
&size);
for (auto p = buf.cbegin(); DWORD(std::distance(buf.cbegin(), p)) < size;) {
auto tag = TLV_PROPERTIES(*p++);
Expand Down Expand Up @@ -134,8 +135,9 @@ class CardImpl
{
uint8_t PINFrameOffset = 0;
uint8_t PINLengthOffset = 0;
byte_vector cmd(sizeof(PIN_VERIFY_STRUCTURE));
auto* data = (PIN_VERIFY_STRUCTURE*)cmd.data();
const byte_vector& d = commandApdu;
byte_vector cmd(sizeof(PIN_VERIFY_STRUCTURE) + d.size());
auto* data = new (cmd.data()) PIN_VERIFY_STRUCTURE {};
data->bTimerOut = PIN_PAD_PIN_ENTRY_TIMEOUT;
data->bTimerOut2 = PIN_PAD_PIN_ENTRY_TIMEOUT;
data->bmFormatString =
Expand All @@ -147,21 +149,22 @@ class CardImpl
data->bNumberMessage = CCIDDefaultInvitationMessage;
data->wLangId = lang;
data->bMsgIndex = NoInvitationMessage;
const byte_vector& d = commandApdu;
data->ulDataLength = uint32_t(d.size());
cmd.insert(cmd.cend(), d.cbegin(), d.cend());
std::copy(d.cbegin(), d.cend(), cmd.begin() + sizeof(PIN_VERIFY_STRUCTURE));

auto ioctl = feature(FEATURE_VERIFY_PIN_START);
if (feature(FEATURE_VERIFY_PIN_START) == features.cend())
ioctl = feature(FEATURE_VERIFY_PIN_DIRECT);
byte_vector responseBytes(ResponseApdu::MAX_SIZE, 0);
auto responseLength = DWORD(responseBytes.size());
SCard(Control, cardHandle, ioctl->value, cmd.data(), DWORD(cmd.size()),
const DWORD controlCode = ioctl->value;
SCard(Control, cardHandle, controlCode, cmd.data(), DWORD(cmd.size()),
LPVOID(responseBytes.data()), DWORD(responseBytes.size()), &responseLength);

if (auto finish = feature(FEATURE_VERIFY_PIN_FINISH); finish != features.cend()) {
responseLength = DWORD(responseBytes.size());
SCard(Control, cardHandle, finish->value, nullptr, 0U, LPVOID(responseBytes.data()),
const DWORD finishControlCode = finish->value;
SCard(Control, cardHandle, finishControlCode, nullptr, 0U, LPVOID(responseBytes.data()),
DWORD(responseBytes.size()), &responseLength);
}

Expand Down
Loading