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

msvcp90: Fixed copied buffer siezes in functions operating on wchar_t.

This commit is contained in:
Piotr Caban 2012-09-11 16:08:21 +02:00 committed by Alexandre Julliard
parent cba2102b7e
commit 5258b3a219
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/msvcp100/ios.c
View File

@ -1822,11 +1822,11 @@ streamsize __thiscall basic_streambuf_wchar__Xsgetn_s(basic_streambuf_wchar *thi
chunk = count-copied;
if(chunk > 0) {
memcpy_s(ptr+copied, size, *this->prpos, chunk);
memcpy_s(ptr+copied, size, *this->prpos, chunk*sizeof(wchar_t));
*this->prpos += chunk;
*this->prsize -= chunk;
copied += chunk;
size -= chunk;
size -= chunk*sizeof(wchar_t);
}else if((c = call_basic_streambuf_wchar_uflow(this)) != WEOF) {
ptr[copied] = c;
copied++;
@ -2315,7 +2315,7 @@ streamsize __thiscall basic_streambuf_wchar_xsputn(basic_streambuf_wchar *this,
chunk = count-copied;
if(chunk > 0) {
memcpy(*this->pwpos, ptr+copied, chunk);
memcpy(*this->pwpos, ptr+copied, chunk*sizeof(wchar_t));
*this->pwpos += chunk;
*this->pwsize -= chunk;
copied += chunk;
@ -3948,7 +3948,7 @@ void __thiscall basic_stringbuf_wchar__Init(basic_stringbuf_wchar *this, const w
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
memcpy(buf, str, count);
memcpy(buf, str, count*sizeof(wchar_t));
this->seekhigh = buf + count;
this->state |= STRINGBUF_allocated;

8
dlls/msvcp90/ios.c
View File

@ -1812,11 +1812,11 @@ streamsize __thiscall basic_streambuf_wchar__Xsgetn_s(basic_streambuf_wchar *thi
chunk = count-copied;
if(chunk > 0) {
memcpy_s(ptr+copied, size, *this->prpos, chunk);
memcpy_s(ptr+copied, size, *this->prpos, chunk*sizeof(wchar_t));
*this->prpos += chunk;
*this->prsize -= chunk;
copied += chunk;
size -= chunk;
size -= chunk*sizeof(wchar_t);
}else if((c = call_basic_streambuf_wchar_uflow(this)) != WEOF) {
ptr[copied] = c;
copied++;
@ -2305,7 +2305,7 @@ streamsize __thiscall basic_streambuf_wchar_xsputn(basic_streambuf_wchar *this,
chunk = count-copied;
if(chunk > 0) {
memcpy(*this->pwpos, ptr+copied, chunk);
memcpy(*this->pwpos, ptr+copied, chunk*sizeof(wchar_t));
*this->pwpos += chunk;
*this->pwsize -= chunk;
copied += chunk;
@ -3938,7 +3938,7 @@ void __thiscall basic_stringbuf_wchar__Init(basic_stringbuf_wchar *this, const w
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
}
memcpy(buf, str, count);
memcpy(buf, str, count*sizeof(wchar_t));
this->seekhigh = buf + count;
this->state |= STRINGBUF_allocated;