Chris Robinson : winemp3: Use head_check to check for valid headers.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 22e94d0ba6aaec37b899437dcfc8880c32b31fa3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=22e94d0ba6aaec37b899437dcf...

Author: Chris Robinson 
Date:   Tue Jul 10 09:08:56 2007 -0700

winemp3: Use head_check to check for valid headers.

---

dlls/winemp3.acm/common.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/dlls/winemp3.acm/common.c b/dlls/winemp3.acm/common.c
index 4e28e2e..de329f1 100644
--- a/dlls/winemp3.acm/common.c
+++ b/dlls/winemp3.acm/common.c
@@ -53,7 +53,6 @@ int pcm_point = 0;

#define HDRCMPMASK 0xfffffd00

-#if 0
 int head_check(unsigned long head)
 {
     if( (head & 0xffe00000) != 0xffe00000)
@@ -66,7 +65,6 @@ int head_check(unsigned long head)
    return FALSE;
     return TRUE;
 }
-#endif

/*
@@ -75,6 +73,9 @@ int head_check(unsigned long head)
  */
 int decode_header(struct frame *fr,unsigned long newhead)
 {
+    if(head_check(newhead) == FALSE)
+      return (0);
+
     if( newhead & (1<<20) ) {
       fr->lsf = (newhead & (1<<19)) ? 0x0 : 0x1;
       fr->mpeg25 = 0;
@@ -85,10 +86,6 @@ int decode_header(struct frame *fr,unsigned long newhead)
     }

fr->lay = 4-((newhead>>17)&3);
-    if( ((newhead>>10)&0x3) == 0x3) {
-      fprintf(stderr,"Stream error\n");
-      return (0);
-    }
     if(fr->mpeg25) {
       fr->sampling_frequency = 6 + ((newhead>>10)&0x3);
     }