From c9e6af5949b89600742254b837fd419e26ed2a98 Mon Sep 17 00:00:00 2001 From: uau Date: Sun, 13 Apr 2008 23:04:07 +0000 Subject: demux_asf: Fix operator precedence in packet length check Change (len & 3-1) to correct ((len & 3) - 1) in packet length check. Also change "a - 1 < b" to simpler "a <= b". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26446 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_asf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index b23e0f2c4e..40614f3745 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -46,7 +46,7 @@ static inline unsigned read_varlen(uint8_t **ptr, int len, int def) { * \param len lowest 2 bits indicate number of bytes to read */ static inline int check_varlen(uint8_t *ptr, uint8_t *endptr, int len) { - return len&3 ? ptr + (1<<(len&3 - 1)) - 1 < endptr : 1; + return len&3 ? ptr + (1<<((len&3) - 1)) <= endptr : 1; } static void asf_descrambling(unsigned char **src,unsigned len, struct asf_priv* asf){ -- cgit v1.2.3