Amebis/stdex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stream: cleanup

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2024-01-16 08:24:37 +01:00
parent 59a53e10f4
commit ab94d7014f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/stdex/stream.hpp
View File

@ -540,11 +540,11 @@ namespace stdex
/// ///
size_t write_sa(_In_ LPSAFEARRAY sa) size_t write_sa(_In_ LPSAFEARRAY sa)
{ {
safearray_accessor<void> a(sa);
long ubound, lbound; long ubound, lbound;
if (FAILED(SafeArrayGetUBound(sa, 1, &ubound)) || if (FAILED(SafeArrayGetUBound(sa, 1, &ubound)) ||
FAILED(SafeArrayGetLBound(sa, 1, &lbound))) FAILED(SafeArrayGetLBound(sa, 1, &lbound)))
throw std::invalid_argument("SafeArrayGet[UL]Bound failed"); throw std::invalid_argument("SafeArrayGet[UL]Bound failed");
safearray_accessor<void> a(sa);
return write(a.data(), static_cast<size_t>(ubound) - lbound + 1); return write(a.data(), static_cast<size_t>(ubound) - lbound + 1);
} }
#endif #endif
@ -954,13 +954,15 @@ namespace stdex
LPSAFEARRAY read_sa() LPSAFEARRAY read_sa()
{ {
_Assume_(size() <= SIZE_MAX); _Assume_(size() <= SIZE_MAX);
size_t length = static_cast<size_t>(size()); if (size() > ULONG_MAX)
std::unique_ptr<SAFEARRAY, SafeArrayDestroy_delete> sa(SafeArrayCreateVector(VT_UI1, 0, (ULONG)length)); throw std::range_error("data too big");
ULONG length = static_cast<ULONG>(size());
std::unique_ptr<SAFEARRAY, SafeArrayDestroy_delete> sa(SafeArrayCreateVector(VT_UI1, 0, length));
if (!sa) _Unlikely_ if (!sa) _Unlikely_
throw std::runtime_error("SafeArrayCreateVector failed"); throw std::runtime_error("SafeArrayCreateVector failed");
safearray_accessor<void> a(sa.get());
if (seek(0) != 0) _Unlikely_ if (seek(0) != 0) _Unlikely_
throw std::system_error(sys_error(), std::system_category(), "failed to seek"); throw std::system_error(sys_error(), std::system_category(), "failed to seek");
safearray_accessor<void> a(sa.get());
if (read_array(a.data(), 1, length) != length) if (read_array(a.data(), 1, length) != length)
throw std::system_error(sys_error(), std::system_category(), "failed to read"); throw std::system_error(sys_error(), std::system_category(), "failed to read");
return sa.release(); return sa.release();