ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcirt: Be more obvious in out-of-memory situations. 

Just like in the new ifstream, if we are out of memory it's better to fail
loudly with an obvious FIXME message than to leave user with half-initialized
object causing ephemeral issues that are hard to debug.

Signed-off-by: Arkadiusz Hiler <ahiler@codeweavers.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Arkadiusz Hiler 2020-09-04 12:46:32 +03:00 committed by Alexandre Julliard
parent ad7fa2396e
commit 8749ae83c1
1 changed files with 50 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
dlls/msvcirt/msvcirt.c
View File

@ -3024,11 +3024,15 @@ ostream* __thiscall ostrstream_buffer_ctor(ostream *this, char *buffer, int leng
TRACE("(%p %p %d %d %d)\n", this, buffer, length, mode, virt_init); TRACE("(%p %p %d %d %d)\n", this, buffer, length, mode, virt_init);
if (ssb) { if (!ssb) {
FIXME("out of memory\n");
return NULL;
}
strstreambuf_buffer_ctor(ssb, buffer, length, buffer); strstreambuf_buffer_ctor(ssb, buffer, length, buffer);
if (mode & (OPENMODE_app|OPENMODE_ate)) if (mode & (OPENMODE_app|OPENMODE_ate))
ssb->base.pptr = buffer + strlen(buffer); ssb->base.pptr = buffer + strlen(buffer);
}
return ostrstream_internal_sb_ctor(this, ssb, virt_init); return ostrstream_internal_sb_ctor(this, ssb, virt_init);
} }
@ -3041,8 +3045,13 @@ ostream* __thiscall ostrstream_ctor(ostream *this, BOOL virt_init)
TRACE("(%p %d)\n", this, virt_init); TRACE("(%p %d)\n", this, virt_init);
if (ssb) if (!ssb) {
FIXME("out of memory\n");
return NULL;
}
strstreambuf_ctor(ssb); strstreambuf_ctor(ssb);
return ostrstream_internal_sb_ctor(this, ssb, virt_init); return ostrstream_internal_sb_ctor(this, ssb, virt_init);
} }
@ -4081,11 +4090,14 @@ istream* __thiscall istrstream_buffer_ctor(istream *this, char *buffer, int leng
TRACE("(%p %p %d %d)\n", this, buffer, length, virt_init); TRACE("(%p %p %d %d)\n", this, buffer, length, virt_init);
if (ssb) { if (!ssb) {
FIXME("out of memory\n");
return NULL;
}
strstreambuf_buffer_ctor(ssb, buffer, length, NULL); strstreambuf_buffer_ctor(ssb, buffer, length, NULL);
istream_sb_ctor(this, &ssb->base, virt_init); istream_sb_ctor(this, &ssb->base, virt_init);
} else
istream_ctor(this, virt_init);
base = istream_get_ios(this); base = istream_get_ios(this);
base->vtable = &MSVCP_istrstream_vtable; base->vtable = &MSVCP_istrstream_vtable;
base->delbuf = 1; base->delbuf = 1;
@ -4137,8 +4149,7 @@ istream* __thiscall ifstream_buffer_ctor(istream *this, filedesc fd, char *buffe
TRACE("(%p %d %p %d %d)\n", this, fd, buffer, length, virt_init); TRACE("(%p %d %p %d %d)\n", this, fd, buffer, length, virt_init);
if (!fb) if (!fb) {
{
FIXME("out of memory\n"); FIXME("out of memory\n");
return NULL; return NULL;
} }
@ -4163,8 +4174,7 @@ istream* __thiscall ifstream_fd_ctor(istream *this, filedesc fd, BOOL virt_init)
TRACE("(%p %d %d)\n", this, fd, virt_init); TRACE("(%p %d %d)\n", this, fd, virt_init);
if (!fb) if (!fb) {
{
FIXME("out of memory\n"); FIXME("out of memory\n");
return NULL; return NULL;
} }
@ -4189,8 +4199,7 @@ istream* __thiscall ifstream_open_ctor(istream *this, const char *name, ios_open
TRACE("(%p %s %d %d %d)\n", this, name, mode, protection, virt_init); TRACE("(%p %s %d %d %d)\n", this, name, mode, protection, virt_init);
if (!fb) if (!fb) {
{
FIXME("out of memory\n"); FIXME("out of memory\n");
return NULL; return NULL;
} }
@ -4500,14 +4509,18 @@ iostream* __thiscall strstream_buffer_ctor(iostream *this, char *buffer, int len
TRACE("(%p %p %d %d %d)\n", this, buffer, length, mode, virt_init); TRACE("(%p %p %d %d %d)\n", this, buffer, length, mode, virt_init);
if (ssb) { if (!ssb) {
FIXME("out of memory\n");
return NULL;
}
strstreambuf_buffer_ctor(ssb, buffer, length, buffer); strstreambuf_buffer_ctor(ssb, buffer, length, buffer);
if ((mode & OPENMODE_out) && (mode & (OPENMODE_app|OPENMODE_ate))) if ((mode & OPENMODE_out) && (mode & (OPENMODE_app|OPENMODE_ate)))
ssb->base.pptr = buffer + strlen(buffer); ssb->base.pptr = buffer + strlen(buffer);
return iostream_internal_sb_ctor(this, &ssb->base, &MSVCP_strstream_vtable, virt_init); return iostream_internal_sb_ctor(this, &ssb->base, &MSVCP_strstream_vtable, virt_init);
} }
return iostream_internal_sb_ctor(this, NULL, &MSVCP_strstream_vtable, virt_init);
}
/* ??0strstream@@QAE@XZ */ /* ??0strstream@@QAE@XZ */
/* ??0strstream@@QEAA@XZ */ /* ??0strstream@@QEAA@XZ */
@ -4518,11 +4531,14 @@ iostream* __thiscall strstream_ctor(iostream *this, BOOL virt_init)
TRACE("(%p %d)\n", this, virt_init); TRACE("(%p %d)\n", this, virt_init);
if (ssb) { if (!ssb) {
strstreambuf_ctor(ssb); FIXME("out of memory\n");
return iostream_internal_sb_ctor(this, &ssb->base, &MSVCP_strstream_vtable, virt_init); return NULL;
} }
return iostream_internal_sb_ctor(this, NULL, &MSVCP_strstream_vtable, virt_init);
strstreambuf_ctor(ssb);
return iostream_internal_sb_ctor(this, &ssb->base, &MSVCP_strstream_vtable, virt_init);
} }
/* ?pcount@strstream@@QBEHXZ */ /* ?pcount@strstream@@QBEHXZ */
@ -4567,11 +4583,14 @@ iostream* __thiscall stdiostream_file_ctor(iostream *this, FILE *file, BOOL virt
TRACE("(%p %p %d)\n", this, file, virt_init); TRACE("(%p %p %d)\n", this, file, virt_init);
if (stb) { if (!stb) {
stdiobuf_file_ctor(stb, file); FIXME("out of memory\n");
return iostream_internal_sb_ctor(this, &stb->base, &MSVCP_stdiostream_vtable, virt_init); return NULL;
} }
return iostream_internal_sb_ctor(this, NULL, &MSVCP_stdiostream_vtable, virt_init);
stdiobuf_file_ctor(stb, file);
return iostream_internal_sb_ctor(this, &stb->base, &MSVCP_stdiostream_vtable, virt_init);
} }
/* ?rdbuf@stdiostream@@QBEPAVstdiobuf@@XZ */ /* ?rdbuf@stdiostream@@QBEPAVstdiobuf@@XZ */