commit 3f05998c6a8fd23e8d794b6fdd8b8951b2068a1b
author Alex Villacís Lasso <a_villacis@palosanto.com> Mon Sep 12 20:14:49 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Sep 12 20:14:49 2005 +0000
tree f349a9e1f0ec6840a515aa9a97397d3e4132e4f9
parent d0264588603970062ccc8299adcd19e44b76633c

Initialize structs for mmioDescend and FindChunkAndKeepExtras - fixes
AVI file recognition.

dlls/avifil32/avifile.c

diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c
index 901010d..ea7eccf 100644
--- a/dlls/avifil32/avifile.c
+++ b/dlls/avifil32/avifile.c
@@ -1612,6 +1612,7 @@
   memset(This->ppStreams, 0, sizeof(This->ppStreams));
 
   /* try to get "RIFF" chunk -- must not be at beginning of file! */
+  memset(&ckRIFF, 0, sizeof(ckRIFF));
   ckRIFF.fccType = formtypeAVI;
   if (mmioDescend(This->hmmio, &ckRIFF, NULL, MMIO_FINDRIFF) != S_OK) {
     ERR(": not an AVI!\n");
@@ -1619,12 +1620,14 @@
   }
 
   /* get "LIST" "hdrl" */
+  memset(&ckLIST1, 0, sizeof(ckLIST1));
   ckLIST1.fccType = listtypeAVIHEADER;
   hr = FindChunkAndKeepExtras(&This->fileextra, This->hmmio, &ckLIST1, &ckRIFF, MMIO_FINDLIST);
   if (FAILED(hr))
     return hr;
 
   /* get "avih" chunk */
+  memset(&ck, 0, sizeof(ck));
   ck.ckid = ckidAVIMAINHDR;
   hr = FindChunkAndKeepExtras(&This->fileextra, This->hmmio, &ck, &ckLIST1, MMIO_FINDCHUNK);
   if (FAILED(hr))
@@ -1669,6 +1672,7 @@
     return AVIERR_FILEREAD;
 
   /* foreach stream exists a "LIST","strl" chunk */
+  memset(&ckLIST2, 0, sizeof(ckLIST2));
   for (nStream = 0; nStream < This->fInfo.dwStreams; nStream++) {
     /* get next nested chunk in this "LIST","strl" */
     if (mmioDescend(This->hmmio, &ckLIST2, &ckLIST1, 0) != S_OK)