Skip to content

Check failures at conversion to wide char string #59

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
nobu merged 2 commits into from
Feb 20, 2026
Merged

Check failures at conversion to wide char string #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c9bfe2
Check failures at conversion to wide char string
nobu Aug 2, 2024
2c7dc9f
Omit with verbose messages
nobu Aug 7, 2024
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
6 changes: 6 additions & 0 deletions ext/win32ole/win32ole.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,7 +929,13 @@ ole_mb2wc(char *pm, int len, UINT cp)
#endif
}
size = MultiByteToWideChar(cp, 0, pm, len, NULL, 0);
if (!size) {
ole_raise(HRESULT_LASTERROR(), eWIN32OLERuntimeError, "fail to convert CP%d to Unicode", cp);
}
pw = SysAllocStringLen(NULL, size);
if (!pw) {
ole_raise(HRESULT_LASTERROR(), eWIN32OLERuntimeError, "fail to allocate Unicode string");
}
pw[size-1] = 0;
MultiByteToWideChar(cp, 0, pm, len, pw, size);
return pw;
Expand Down
2 changes: 2 additions & 0 deletions ext/win32ole/win32ole_error.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@ extern VALUE eWIN32OLEQueryInterfaceError;
NORETURN(PRINTF_ARGS(void ole_raise(HRESULT hr, VALUE ecs, const char *fmt, ...), 3, 4));
void Init_win32ole_error(void);

#define HRESULT_LASTERROR() HRESULT_FROM_WIN32(GetLastError())

#endif
9 changes: 9 additions & 0 deletions test/win32ole/test_win32ole.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,15 @@ def test_method_missing
assert_raise(ArgumentError) {@dict1.method_missing("foo=")}
assert_raise(ArgumentError) {@dict1.method_missing("foo=", 1, 2)}
end

def test_invoke_with_too_long_string
skip = ENV["WIN32OLE_MEMORY_INTENSIVE_TESTS"]
return unless skip
omit "This test creates a 1GiB string" unless skip == "yes"
str = "a" * 0x40000000
assert_raise(WIN32OLE::RuntimeError) {@dict1.invoke(str)}
assert_raise(WIN32OLE::RuntimeError) {@dict2.invoke(str)}
end
end

# test of subclass of WIN32OLE
Expand Down