Changeset 424

Timestamp:

02/12/09 22:54:56 (16 years ago)

Author:

r2d

Message:

check block size & changed inline for mpc_inline, MSVC seems to accept static inline but not static inline ...

Location:

libmpc/trunk

Files:

• libmpcdec/mpc_bits_reader.c (modified) (2 diffs)
• libmpcdec/mpc_demux.c (modified) (2 diffs)
• mpcgain/mpcgain.c (modified) (2 diffs)

libmpc/trunk/libmpcdec/mpc_bits_reader.c

@@ -1 +1 @@
 /*
-  Copyright (c) 2007, The Musepack Development Team
+  Copyright (c) 2007-2009, The Musepack Development Team
   All rights reserved.
 
@@ -170 +170 @@
         size += mpc_bits_get_size(r, &(p_block->size));
 
-        p_block->size -= size;
+        if (p_block->size >= size) // check if the block size doesn't conflict with the header size
+                p_block->size -= size;
 
         return size;

libmpc/trunk/libmpcdec/mpc_demux.c

@@ -1 +1 @@
 /*
-  Copyright (c) 2005, The Musepack Development Team
+  Copyright (c) 2005-2009, The Musepack Development Team
   All rights reserved.
 
@@ -119 +119 @@
  * @return MPC_STATUS_INVALIDSV if the key is invalid, MPC_STATUS_OK else
  */
-static inline mpc_status mpc_check_key(char * key)
+static mpc_inline mpc_status mpc_check_key(char * key)
 {
         if (key[0] < 65 || key[0] > 90 || key[1] < 65 || key[1] > 90)

libmpc/trunk/mpcgain/mpcgain.c

@@ -1 +1 @@
 /*
-  Copyright (c) 2006, The Musepack Development Team
+  Copyright (c) 2006-2009, The Musepack Development Team
   All rights reserved.
 
@@ -52 +52 @@
 #define MAX_HEAD_SIZE 20 // maximum size of the packet header before chapter gain (2 + 9 + 9)
 
-const char    About []        = "mpcgain - Musepack (MPC) ReplayGain calculator v" MPCGAIN_VERSION " (C) 2006-2008 MDT\nBuilt " __DATE__ " " __TIME__ "\n";
+const char    About []        = "mpcgain - Musepack (MPC) ReplayGain calculator v" MPCGAIN_VERSION " (C) 2006-2009 MDT\nBuilt " __DATE__ " " __TIME__ "\n";