Changeset 473 for libmpc/trunk/libmpcdec/internal.h

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/internal.h (modified) (2 diffs)

libmpc/trunk/libmpcdec/internal.h

@@ -87 +87 @@
  * checks if a block key is valid
  * @param key the two caracters key to check
- * @return MPC_STATUS_INVALIDSV if the key is invalid, MPC_STATUS_OK else
+ * @return MPC_STATUS_FAIL if the key is invalid, MPC_STATUS_OK else
  */
 static mpc_inline mpc_status mpc_check_key(char * key)
 {
         if (key[0] < 65 || key[0] > 90 || key[1] < 65 || key[1] > 90)
-                return MPC_STATUS_INVALIDSV;
+                return MPC_STATUS_FAIL;
         return MPC_STATUS_OK;
 }
@@ -101 +101 @@
 void mpc_decoder_synthese_filter_float(mpc_decoder *d, MPC_SAMPLE_FORMAT* OutData, mpc_int_t channels);
 
+#define MPC_IS_FAILURE(X) ((int)(X) < (int)MPC_STATUS_OK)
+#define MPC_AUTO_FAIL(X) { mpc_status s = (X); if (MPC_IS_FAILURE(s)) return s; }
+
+
 #ifdef __cplusplus
 }