Changeset 5650:21e9c5f21d73 in roaraudio

Timestamp:

09/12/12 12:37:05 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

did some hardening for key names being NULL within a kv array of known length.

File:

• libroar/keyval.c (modified) (2 diffs)

libroar/keyval.c

@@ -40 +40 @@
  ssize_t i;
 
+ ROAR_DBG("roar_keyval_lookup(kv=%p, key=%p'%s', len=%li, casesens=%i) = ?", kv, key, key, (long int)len, casesens);
+
  if ( kv == NULL || key == NULL ) {
+  ROAR_DBG("roar_keyval_lookup(kv=%p, key=%p'%s', len=%li, casesens=%i) = NULL //error=FAULT", kv, key, key, (long int)len, casesens);
   roar_err_set(ROAR_ERROR_FAULT);
   return NULL;
@@ -49 +52 @@
 
  for (i = 0; len != -1 ? (i < len) : kv[i].key != NULL; i++) {
-  if ( !sc(key, kv[i].key) )
+  if ( kv[i].key != NULL && !sc(key, kv[i].key) )
    return &(kv[i]);
  }
 
+ ROAR_DBG("roar_keyval_lookup(kv=%p, key=%p'%s', len=%li, casesens=%i) = NULL //error=NOENT", kv, key, key, (long int)len, casesens);
  roar_err_set(ROAR_ERROR_NOENT);
  return NULL;