Changeset 1068:cd86a0f4adab in roaraudio

Timestamp:

12/28/08 02:40:49 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

make OpenBSD security warnings patch a bit happyer...: strcpy() -> strncpy()

Location:

libroar

Files:

• meta.c (modified) (1 diff)
• simple.c (modified) (1 diff)
• socket.c (modified) (2 diffs)

libroar/meta.c

@@ -85 +85 @@
 char * roar_meta_strtype(int type) {
  int i;
- static char name[24];
+ static char name[ROAR_META_MAX_NAMELEN];
 
  for (i = 0; _libroar_meta_typelist[i].id != -1; i++)
   if ( _libroar_meta_typelist[i].id == type ) {
-   strcpy(name, _libroar_meta_typelist[i].name);
+   strncpy(name, _libroar_meta_typelist[i].name, ROAR_META_MAX_NAMELEN);
    return name;
   }

libroar/simple.c

@@ -130 +130 @@
   }
  } else {
-  strcpy(file, inet_ntoa(socket_addr.sin_addr));
+  strncpy(file, inet_ntoa(socket_addr.sin_addr), 79);
  }
 

libroar/socket.c

@@ -346 +346 @@
  } else {
   bind_sockaddr.sdn_objnamel  = ROAR_dn_htons(strlen(object));
-  strcpy((char*)bind_sockaddr.sdn_objname, object); // FIXME: shouldn't we use strncpy()?
+  if ( bind_sockaddr.sdn_objnamel > DN_MAXOBJL )
+   bind_sockaddr.sdn_objnamel = DN_MAXOBJL;
+  strncpy((char*)bind_sockaddr.sdn_objname, object, DN_MAXOBJL);
  }
 
@@ -884 +886 @@
 
  if ( !strcmp(host, "+fork") ) {
-  strcpy(rcmd, "roard --no-listen --client-fh 0");
+  strncpy(rcmd, "roard --no-listen --client-fh 0", 32);
  } else {
   if ( use_socat ) {