diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-06 20:56:35 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-06 20:56:35 +0000 |
commit | 9641a1433c7573ab78c1c0123f3226b21f757d8e (patch) | |
tree | 4e1faec39f40fcd42c2ab9ddc0fb577e1771e4d3 /libmpdemux/aviheader.c | |
parent | 9ec42a7e3f03b57851d92994453e30e40d86a55d (diff) | |
download | mpv-9641a1433c7573ab78c1c0123f3226b21f757d8e.tar.bz2 mpv-9641a1433c7573ab78c1c0123f3226b21f757d8e.tar.xz |
use calloc instead of malloc - simplifies code and fixes overflow problems.
Path by Bjorn Sandell (biorn at chalmers se)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18052 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/aviheader.c')
-rw-r--r-- | libmpdemux/aviheader.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c index 88208a4f3d..93794ea1ce 100644 --- a/libmpdemux/aviheader.c +++ b/libmpdemux/aviheader.c @@ -206,7 +206,6 @@ while(1){ break; } case mmioFOURCC('i', 'n', 'd', 'x'): { uint32_t i; - unsigned msize = 0; avisuperindex_chunk *s; priv->suidx_size++; priv->suidx = realloc(priv->suidx, priv->suidx_size * sizeof (avisuperindex_chunk)); @@ -235,11 +234,8 @@ while(1){ mp_msg (MSGT_HEADER, MSGL_WARN, "Broken super index chunk size: %u\n",s->wLongsPerEntry); s->wLongsPerEntry = sizeof(avisuperindex_entry)/4; } - msize = sizeof (avisuperindex_entry) * s->nEntriesInUse; - s->aIndex = malloc(msize); - memset (s->aIndex, 0, msize); - s->stdidx = malloc (s->nEntriesInUse * sizeof (avistdindex_chunk)); - memset (s->stdidx, 0, s->nEntriesInUse * sizeof (avistdindex_chunk)); + s->aIndex = calloc(s->nEntriesInUse, sizeof (avisuperindex_entry)); + s->stdidx = calloc(s->nEntriesInUse, sizeof (avistdindex_chunk)); // now the real index of indices for (i=0; i<s->nEntriesInUse; i++) { |