Changeset 138 for libmpc/branches/r2d/libmpcdec/streaminfo.c

Timestamp:

11/15/06 13:29:00 (17 years ago)

Author:

r2d

Message:

• added CRC check in libmpcdec

File:

• libmpc/branches/r2d/libmpcdec/streaminfo.c (modified) (2 diffs)

libmpc/branches/r2d/libmpcdec/streaminfo.c

@@ -39 +39 @@
 #include <stdio.h>
 #include "internal.h"
+
+unsigned long crc32(unsigned char *buf, int len);
 
 mpc_uint32_t mpc_bits_read(mpc_bits_reader * r, const unsigned int nb_bits);
@@ -139 +141 @@
 /// Reads streaminfo from SV8 header.
 mpc_status
-streaminfo_read_header_sv8(mpc_streaminfo* si, const mpc_bits_reader * r_in)
-{
-        mpc_uint32_t CRC;
+streaminfo_read_header_sv8(mpc_streaminfo* si, const mpc_bits_reader * r_in,
+                                                   mpc_size_t block_size)
+{
+        mpc_uint32_t CRC, CRC_tmp;
         mpc_bits_reader r = *r_in;
 
-        // FIXME : add CRC check
         CRC = mpc_bits_read(&r, 32);
+        CRC_tmp = crc32(r.buff + 1 - (r.count >> 3), block_size - 4);
+        if (CRC != CRC_tmp)
+                return MPC_STATUS_FILE;
+
         si->stream_version = mpc_bits_read(&r, 8);
         mpc_bits_get_size(&r, &si->samples);