From 05a778b1c43124e6a58df9959cc4035167b33812 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Fri, 30 Mar 2012 12:04:15 +0200 Subject: [PATCH] typefind: Use unchecked byte reader methods where possible The size is checked before, so we can use them. --- gst/typefind/gsttypefindfunctions.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gst/typefind/gsttypefindfunctions.c b/gst/typefind/gsttypefindfunctions.c index 0bffe53..d4edd15 100644 --- a/gst/typefind/gsttypefindfunctions.c +++ b/gst/typefind/gsttypefindfunctions.c @@ -235,18 +235,18 @@ check_utf16 (const guint8 * data, gint len, gint endianness) while (len >= 2) { /* test first for a single 16 bit value in the BMP */ if (endianness == G_BIG_ENDIAN) - gst_byte_reader_get_uint16_be (&br, &high); + high = gst_byte_reader_get_uint16_be_unchecked (&br); else - gst_byte_reader_get_uint16_le (&br, &high); + high = gst_byte_reader_get_uint16_le_unchecked (&br); if (high >= 0xD800 && high <= 0xDBFF) { /* start of a surrogate pair */ if (len < 4) return FALSE; len -= 2; if (endianness == G_BIG_ENDIAN) - gst_byte_reader_get_uint16_be (&br, &low); + low = gst_byte_reader_get_uint16_be_unchecked (&br); else - gst_byte_reader_get_uint16_le (&br, &low); + low = gst_byte_reader_get_uint16_le_unchecked (&br); if (low >= 0xDC00 && low <= 0xDFFF) { /* second half of the surrogate pair */ } else -- 2.7.4