# HG changeset patch # User mru # Date 1282577937 0 # Node ID 6928d93146e63df9d0cbc97cafbaa8924df6c05a # Parent dda201b8a6f6f6ff3cdbc7c601456d9c8a83c776 asfcrypt: fix unaligned read in ff_asfcrypt_dec() diff -r dda201b8a6f6 -r 6928d93146e6 asfcrypt.c --- a/asfcrypt.c Mon Aug 23 11:53:27 2010 +0000 +++ b/asfcrypt.c Mon Aug 23 15:38:57 2010 +0000 @@ -156,7 +156,7 @@ av_rc4_crypt(&rc4, (uint8_t *)rc4buff, NULL, sizeof(rc4buff), NULL, 1); multiswap_init((uint8_t *)rc4buff, ms_keys); - packetkey = qwords[num_qwords - 1]; + packetkey = AV_RN64(&qwords[num_qwords - 1]); packetkey ^= rc4buff[7]; av_des_init(&des, key + 12, 64, 1); av_des_crypt(&des, (uint8_t *)&packetkey, (uint8_t *)&packetkey, 1, NULL, 1);