Changeset 5754:b23d79c13370 in roaraudio for roard/roard.c

Timestamp:

11/16/12 16:49:56 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

avoid getenv() and use more portable roar_env_get(). Also improved security as we enfore const now on bufferes obtained from the env.

File:

• roard/roard.c (modified) (13 diffs)

roard/roard.c

@@ -88 +88 @@
 
 #ifdef ROAR_SUPPORT_LISTEN
-static char * server[ROAR_MAX_LISTEN_SOCKETS];
+static const char * server[ROAR_MAX_LISTEN_SOCKETS];
 #endif
 
@@ -561 +561 @@
 }
 
-int get_listen(struct roard_listen ** sock, char *** sockname) {
+int get_listen(struct roard_listen ** sock, const char *** sockname) {
  int i;
 
@@ -786 +786 @@
 
 int get_listen_profile (const char * name,
-                        int * port, char ** sockaddr, int * type,
+                        int * port, const char ** sockaddr, int * type,
                         int * proto,
                         int * dir, struct roar_audio_info * info) {
@@ -798 +798 @@
 
    if ( p->type == ROAR_SOCKET_TYPE_UNIX && p->sockaddr[0] != '+' ) {
-    roar_env_render_path_r(buf, sizeof(buf), p->sockaddr);
+    if ( roar_env_render_path_r(buf, sizeof(buf), p->sockaddr) == -1 )
+     continue;
    } else {
     strncpy(buf, p->sockaddr, sizeof(buf));
@@ -822 +823 @@
 #endif
 
-int add_listen (char * addr, int port, int sock_type, char * user, char * group, int proto, int dir, struct roar_audio_info * info) {
+int add_listen (const char * addr, int port, int sock_type, char * user, char * group, int proto, int dir, struct roar_audio_info * info) {
 #if defined(ROAR_HAVE_SETGID) && defined(ROAR_HAVE_IO_POSIX)
  struct group   * grp  = NULL;
@@ -861 +862 @@
 #ifdef ROAR_HAVE_UNIX
    if ( *addr == '/' ) {
-    if ( (env_roar_proxy_backup = getenv("ROAR_PROXY")) != NULL ) {
+    if ( (env_roar_proxy_backup = (char*)roar_env_get("ROAR_PROXY")) != NULL ) {
      env_roar_proxy_backup = roar_mm_strdup(env_roar_proxy_backup);
      unsetenv("ROAR_PROXY");
@@ -1214 +1215 @@
 // X11:
 #ifdef ROAR_HAVE_LIBX11
-int register_x11 (int unreg, char * sockname) {
+int register_x11 (int unreg, const char * sockname) {
  struct roar_x11_connection * x11con = NULL;
  int ret = 0;
@@ -1252 +1253 @@
 }
 
-int register_slp (int unreg, char * sockname) {
+int register_slp (int unreg, const char * sockname) {
 #ifdef ROAR_HAVE_LIBSLP
  static int regged = 0;
- static char * sn = NULL;
+ static const char * sn = NULL;
  SLPError err;
  SLPError callbackerr;
@@ -1437 +1438 @@
 #ifdef ROAR_SUPPORT_LISTEN
  int    port       = ROAR_DEFAULT_PORT;
- char * sock_addr  = NULL;
+ const char * sock_addr  = NULL;
  int    sock_proto = ROAR_PROTO_ROARAUDIO;
  int    sock_dir   = -1;
@@ -1449 +1450 @@
  int    s_prim    = 0;
 #endif
- char * o_drv     = getenv("ROAR_DRIVER");
- char * o_dev     = getenv("ROAR_DEVICE");
+ char * o_drv     = NULL;
+ char * o_dev     = NULL;
  char * o_opts    = NULL;
  int    o_prim    = 0;
@@ -1508 +1509 @@
  ROAR_DBG("main(*): starting roard...");
 
+// NOTE: those to lions can generate a memory leak. The OS will clean that up on exit.
+ if ( roar_env_get("ROAR_DRIVER") != NULL )
+  o_drv = roar_mm_strdup(roar_env_get("ROAR_DRIVER"));
+ if ( roar_env_get("ROAR_DEVICE") != NULL )
+  o_dev = roar_mm_strdup(roar_env_get("ROAR_DEVICE"));
+
  g_standby       =  0;
  g_autostandby   =  0;
@@ -1603 +1610 @@
 
 #ifdef ROAR_HAVE_GETUID
- if ( getuid() != 0 && getenv("HOME") != NULL ) {
+ if ( getuid() != 0 && roar_env_get("HOME") != NULL ) {
 /*
   snprintf(user_sock, 79, "%s/%s", (char*)getenv("HOME"), ROAR_DEFAULT_SOCK_USER);
 */
-  roar_env_render_path_r(user_sock, sizeof(user_sock), "~/" ROAR_DEFAULT_SOCK_USER);
+  if ( roar_env_render_path_r(user_sock, sizeof(user_sock), "~/" ROAR_DEFAULT_SOCK_USER) == -1 ) {
+   strncpy(user_sock, "/NX-SOCK", sizeof(user_sock));
+  }
   sock_addr = user_sock;
   ROAR_DBG("main(*): setting sock_addr='%s'", sock_addr);
@@ -1613 +1622 @@
 #endif
 
- if ( getenv("ROAR_SERVER") != NULL )
-  sock_addr = getenv("ROAR_SERVER");
+ if ( roar_env_get("ROAR_SERVER") != NULL )
+  sock_addr = roar_env_get("ROAR_SERVER");
 #endif