Attachment 10668 Details for Bug 11492 – don't do unaligned accesses

[patch] don't do unaligned accesses

diff (text/plain), 2.13 KB, created by Benjamin Otte on 2007-07-11 07:34:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Benjamin Otte

Created: 2007-07-11 07:34:39 UTC

Size: 2.13 KB

patch

obsolete

>diff --git a/doc/.gitignore b/doc/.gitignore
>diff --git a/doc/Makefile.am b/doc/Makefile.am
>diff --git a/doc/swfdec-docs.sgml b/doc/swfdec-docs.sgml
>diff --git a/doc/swfdec-overrides.txt b/doc/swfdec-overrides.txt
>diff --git a/doc/swfdec-sections.txt b/doc/swfdec-sections.txt
>diff --git a/doc/swfdec.types b/doc/swfdec.types
>diff --git a/libswfdec/swfdec_bits.c b/libswfdec/swfdec_bits.c
>index c8a5062..8ec6936 100644
>--- a/libswfdec/swfdec_bits.c
>+++ b/libswfdec/swfdec_bits.c
>@@ -307,11 +307,9 @@ swfdec_bits_get_float (SwfdecBits * b)
> 
>   SWFDEC_BYTES_CHECK (b, 4);
> 
>-  conv.i = *((gint32 *) b->ptr);
>+  conv.i = (b->ptr[3] << 24) | (b->ptr[2] << 16) | (b->ptr[1] << 8) | b->ptr[0];
>   b->ptr += 4;
> 
>-  conv.i = GINT32_FROM_LE (conv.i);
>-
>   return conv.f;
> }
> 
>@@ -323,40 +321,30 @@ swfdec_bits_get_float (SwfdecBits * b)
>  * use this command line:
>  * python -c "import struct; print struct.unpack('8c', struct.pack('d', 7.949928895127363e-275))"
>  */
>-static double 
>-swfdec_bits_double_to_host (double in)
>+double
>+swfdec_bits_get_double (SwfdecBits * b)
> {
>   union {
>     guint32 i[2];
>     double d;
>   } conv;
> 
>-  conv.d = in;
>+  SWFDEC_BYTES_CHECK (b, 8);
>+
> #if G_BYTE_ORDER == G_LITTLE_ENDIAN
>-  {
>-    int tmp = conv.i[0];
>-    conv.i[0] = conv.i[1];
>-    conv.i[1] = tmp;
>-  }
>+  conv.i[1] = (b->ptr[3] << 24) | (b->ptr[2] << 16) | (b->ptr[1] << 8) | b->ptr[0];
>+  conv.i[0] = (b->ptr[7] << 24) | (b->ptr[6] << 16) | (b->ptr[5] << 8) | b->ptr[4];
> #else
>-  conv.i[0] = GUINT32_FROM_LE (conv.i[0]);
>-  conv.i[1] = GUINT32_FROM_LE (conv.i[1]);
>+  conv.i[0] = (b->ptr[3] << 24) | (b->ptr[2] << 16) | (b->ptr[1] << 8) | b->ptr[0];
>+  conv.i[1] = (b->ptr[7] << 24) | (b->ptr[6] << 16) | (b->ptr[5] << 8) | b->ptr[4];
>+#if 0
>+  conv.i[0] = (b->ptr[0] << 24) | (b->ptr[1] << 16) | (b->ptr[2] << 8) | b->ptr[3];
>+  conv.i[1] = (b->ptr[4] << 24) | (b->ptr[5] << 16) | (b->ptr[6] << 8) | b->ptr[7];
>+#endif
> #endif
>-  return conv.d;
>-}
>-
>-double
>-swfdec_bits_get_double (SwfdecBits * b)
>-{
>-  double d;
>-
>-  SWFDEC_BYTES_CHECK (b, 8);
>-
>-  d = *((double *) b->ptr);
>   b->ptr += 8;
>-  d = swfdec_bits_double_to_host (d);
> 
>-  return d;
>+  return conv.d;
> }
> 
> double

Actions: View | Splinter Review

Attachments on bug 11492: 10668

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.