Changeset 473 for libmpc/trunk/libmpcdec/streaminfo.c

Timestamp:

07/28/11 21:51:30 (13 years ago)

Author:

r2d

Message:

Security fixes by DEATH (and some changes by myself)

File:

• libmpc/trunk/libmpcdec/streaminfo.c (modified) (3 diffs)

libmpc/trunk/libmpcdec/streaminfo.c

@@ -100 +100 @@
 {
         if (si->max_band == 0 || si->max_band >= 32
-            || si->channels > 2)
-                return MPC_STATUS_FILE;
+            || si->channels > 2 || si->channels == 0 || si->sample_freq == 0)
+                return MPC_STATUS_FAIL;
         return MPC_STATUS_OK;
 }
@@ -156 +156 @@
 
         if (last_frame_samples == 0) last_frame_samples = MPC_FRAME_LENGTH;
+        else if (last_frame_samples > MPC_FRAME_LENGTH) return MPC_STATUS_FAIL;
         si->samples = (mpc_int64_t) frames * MPC_FRAME_LENGTH;
         if (si->is_true_gapless)
@@ -192 +193 @@
         CRC = (mpc_bits_read(&r, 16) << 16) | mpc_bits_read(&r, 16);
         if (CRC != mpc_crc32(r.buff + 1 - (r.count >> 3), (int)block_size - 4))
-                return MPC_STATUS_FILE;
+                return MPC_STATUS_FAIL;
 
         si->stream_version = mpc_bits_read(&r, 8);
         if (si->stream_version != 8)
-                return MPC_STATUS_INVALIDSV;
+                return MPC_STATUS_FAIL;
 
         mpc_bits_get_size(&r, &si->samples);