From: Alex Henrie alexhenrie24@gmail.com
--- dlls/msado15/connection.c | 3 +-- dlls/msado15/recordset.c | 3 +-- dlls/msado15/stream.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index d6ca0c2df39..01909a71f62 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -750,9 +750,8 @@ static HRESULT WINAPI connpoint_Advise( IConnectionPoint *iface, IUnknown *unk_s if (i == connpoint->sinks_size) { new_size = connpoint->sinks_size * 2; - if (!(tmp = realloc( connpoint->sinks, new_size * sizeof(*connpoint->sinks) ))) + if (!(tmp = _recalloc( connpoint->sinks, new_size, sizeof(*connpoint->sinks) ))) return E_OUTOFMEMORY; - memset( tmp + connpoint->sinks_size, 0, (new_size - connpoint->sinks_size) * sizeof(*connpoint->sinks) ); connpoint->sinks = tmp; connpoint->sinks_size = new_size; } diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index aa2db6e2968..22dec457dfe 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1338,8 +1338,7 @@ static BOOL resize_recordset( struct recordset *recordset, ULONG row_count ) { VARIANT *tmp; ULONG count = max( row_count, recordset->allocated * 2 ); - if (!(tmp = realloc( recordset->data, count * row_size ))) return FALSE; - memset( tmp + recordset->allocated, 0, (count - recordset->allocated) * row_size ); + if (!(tmp = _recalloc( recordset->data, count, row_size ))) return FALSE; recordset->data = tmp; recordset->allocated = count; } diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 50833aecf34..d9120496578 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -182,8 +182,7 @@ static HRESULT resize_buffer( struct stream *stream, LONG size ) { BYTE *tmp; LONG new_size = max( size, stream->allocated * 2 ); - if (!(tmp = realloc( stream->buf, new_size ))) return E_OUTOFMEMORY; - memset( tmp + stream->allocated, 0, new_size - stream->allocated ); + if (!(tmp = _recalloc( stream->buf, new_size, 1 ))) return E_OUTOFMEMORY; stream->buf = tmp; stream->allocated = new_size; }