Changeset 4790:c1073581d7c2 in roaraudio for roard

Timestamp:

03/11/11 11:25:22 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for long (> sizeof(mes.data)-4) cookies, fixed memory use-after-free bug in roard

Location:

roard

Files:

• req.c (modified) (1 diff)
• roard.c (modified) (2 diffs)

roard/req.c

@@ -115 +115 @@
   return -1;
 
- ROAR_INFO("req_on_auth(client=%i,...): authtype=%s(%i)", ROAR_DBG_INFO_VERBOSE,
-                           client, roar_autht2str(authmes.type), authmes.type);
+ ROAR_INFO("req_on_auth(client=%i,...): authtype=%s(%i), len=%llu bytes", ROAR_DBG_INFO_VERBOSE,
+                           client, roar_autht2str(authmes.type), authmes.type, (long long unsigned int)authmes.len);
 
  ret = auth_client_ckeck(cs, &authmes, &next);

roard/roard.c

@@ -1374 +1374 @@
  struct roar_authfile_key *  key = NULL;
  int af_type = ROAR_AUTHFILE_TYPE_AUTO;
+ void * keydata;
 
  if ( type == NULL ) {
@@ -1428 +1429 @@
     }
 
-    if ( auth_addkey_cookie(acclev, key->data, key->len) == -1 ) {
+    keydata = roar_mm_memdup(key->data, key->len);
+
+    if ( keydata == NULL ) {
+     ROAR_WARN("add_authfile(*): Can not allocate memory for key.");
+    } else if ( auth_addkey_cookie(acclev, keydata, key->len) == -1 ) {
      ROAR_WARN("add_authfile(*): Can not add key to internal key storage.");
     }