Skip to content

fix: dynamic sized key-value pair #14

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
ColinKYuen wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

fix: dynamic sized key-value pair #14

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
7 changes: 5 additions & 2 deletions setupgui/setupgui.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,12 @@ void setControlEnabled(unsigned int framenum, int idc, my_bool state);
#define GET_STRING(name) \
{ \
SQLWCHAR *res = getStrFieldData(hwnd, IDC_EDIT_##name); \
if (res && *res) \
if (res && *res) { \
params->opt_##name = res; \
free(res); \
} \
else \
params->opt_##name.set_default(nullptr); \
params->opt_##name.set_default(nullptr); \
}

#define GET_STRING_TAB(framenum, name) \
Expand Down Expand Up @@ -253,6 +255,7 @@ void setUnsignedFieldData(gchar *widget_name, unsigned int param);
SQLWCHAR *res = getStrFieldData((gchar*)#name); \
if (res && *res) \
params->opt_##name = res; \
free(res); \
else \
params->opt_##name.set_default(nullptr); \
}
Expand Down
5 changes: 3 additions & 2 deletions setupgui/windows/odbcdialogparams.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,9 @@ SQLWCHAR * getStrFieldData(HWND hwnd, int idc)
int len = Edit_GetTextLength(GetDlgItem(hwnd,idc));
if (len > 0)
{
Edit_GetText(GetDlgItem(hwnd, idc), out_buf, len + 1);
return out_buf;
SQLWCHAR* buff = new SQLWCHAR[len + 1];
Edit_GetText(GetDlgItem(hwnd, idc), buff, len + 1);
return buff;
}
return nullptr;
}
Expand Down
9 changes: 3 additions & 6 deletions util/installer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ int Driver::to_kvpair_null(SQLWCHAR *attrs, size_t attrslen)
*/
void optionStr::set_remove_brackets(const SQLWCHAR *val_char,
SQLINTEGER len) {
SQLWCHAR out[1024] = { 0 };
SQLWSTRING out;

if (!val_char) {
set_null();
Expand All @@ -651,26 +651,23 @@ void optionStr::set_remove_brackets(const SQLWCHAR *val_char,
if (charcount)
{
const SQLWCHAR *val = val_str.c_str();
SQLWCHAR *pos = out;
while (charcount)
{
*pos = *val;
out += *val;
if (charcount > 1 && ((*val == '}' && *(val + 1) == '}')))
{
++val;
--charcount;
}

++pos;
++val;
--charcount;
}
*pos = 0; // Terminate the string
}

m_wstr = out;
// Re-use existing buffer, just as another type
SQLCHAR *c_out = reinterpret_cast<SQLCHAR *>(out);
SQLCHAR *c_out = reinterpret_cast<SQLCHAR *>(const_cast<wchar_t *>(out.c_str()));
len = (SQLINTEGER)val_str.length();
char *result = (char *)sqlwchar_as_utf8_ext(m_wstr.c_str(), &len,
c_out, sizeof(out), nullptr);
Expand Down