Changeset 5589:de9dbc2ecc4b in roaraudio

Timestamp:

07/22/12 13:21:15 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Updated UUID support to fixs shortcoming detected by rpld. Closes: #276 (critical bug)

Files:

• ChangeLog (modified) (1 diff)
• include/libroar/uuid.h (modified) (1 diff)
• libroar/uuid.c (modified) (3 diffs)

ChangeLog

@@ -10 +10 @@
         * Support a common protocol interface (Closes: #257)
         * Converted roard plugins to universal where possible (Closes: #256)
+        * Corrected critical bug in UUID support (compare function overwrote
+          arguments) (Closes: #276)
 
 v. 1.0beta3 - Sun Jul 15 2012 26:08 CEST

include/libroar/uuid.h

@@ -50 +50 @@
 };
 
-int roar_uuid_eq(roar_uuid_t a, roar_uuid_t b);
-int roar_uuid2str(char * str, roar_uuid_t uuid, ssize_t len);
+// compare two UUIDs: return 1 if they are the same, 0 if they are not and -1 in case of error.
+int roar_uuid_eq(const roar_uuid_t a, const roar_uuid_t b);
+
+int roar_uuid2str(char * str, const roar_uuid_t uuid, ssize_t len);
 int roar_str2uuid(roar_uuid_t uuid, const char * str);
 int roar_uuid_gen(roar_uuid_t uuid, enum roar_uuid_type type, roar_uuid_t ns, void * argp, ssize_t arglen);

libroar/uuid.c

@@ -36 +36 @@
 #include "libroar.h"
 
-int roar_uuid_eq(roar_uuid_t a, roar_uuid_t b) {
+int roar_uuid_eq(const roar_uuid_t a, const roar_uuid_t b) {
  if ( a == NULL || b == NULL ) {
   roar_err_set(ROAR_ERROR_FAULT);
@@ -42 +42 @@
  }
 
- if ( memcpy(a, b, sizeof(roar_uuid_t)) == 0 )
+ if ( memcmp(a, b, sizeof(roar_uuid_t)) == 0 )
   return 1;
 
@@ -48 +48 @@
 }
 
-int roar_uuid2str(char * str, roar_uuid_t uuid, ssize_t len) {
+int roar_uuid2str(char * str, const roar_uuid_t uuid, ssize_t len) {
  if ( str == NULL || uuid == NULL ) {
   roar_err_set(ROAR_ERROR_FAULT);