From 1df5609d5262d12384cbc52640d84d614cc89111 Mon Sep 17 00:00:00 2001 From: Marcelo Roberto Jimenez Date: Thu, 10 Mar 2011 16:21:25 -0300 Subject: [PATCH] Fix for uuid_unpack incorrect shift precedence. --- ChangeLog | 7 +++++++ THANKS | 1 + upnp/src/uuid/uuid.c | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 71bac1a..e0e9ec4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -251,6 +251,13 @@ Version 1.8.0 * Rewrote Peter Hartley's patch to include a new extra header field in FileInfo. +******************************************************************************* +Version 1.6.13 +******************************************************************************* + +2011-03-08 Iain Denniston + Fix for uuid_unpack incorrect shift precedence. + ******************************************************************************* Version 1.6.12 ******************************************************************************* diff --git a/THANKS b/THANKS index 7c5ba8c..af26aa1 100644 --- a/THANKS +++ b/THANKS @@ -31,6 +31,7 @@ exempt of errors. - Fredrik Svensson - Glen Masgai - Hartmut Holzgraefe (hholzgra) +- Iain Denniston (ectotropic) - Ingo Hofmann - Ivan Romanov (ivanromanov) - Jiri Zouhar diff --git a/upnp/src/uuid/uuid.c b/upnp/src/uuid/uuid.c index da4e036..211b61f 100644 --- a/upnp/src/uuid/uuid.c +++ b/upnp/src/uuid/uuid.c @@ -109,7 +109,7 @@ void format_uuid_v1(uuid_upnp * uid, uid->time_hi_and_version = (uint16_t)((timestamp >> 48) & 0x0FFF); uid->time_hi_and_version |= (1 << 12); uid->clock_seq_low = (uint8_t) (clock_seq & 0xFF); - uid->clock_seq_hi_and_reserved = (uint8_t) (clock_seq & 0x3F00) >> 8; + uid->clock_seq_hi_and_reserved = (uint8_t) ((clock_seq & 0x3F00) >> 8); uid->clock_seq_hi_and_reserved |= 0x80; memcpy(&uid->node, &node, sizeof uid->node); };