Changeset 5120:f6832cb5c2ea in roaraudio for libroar


Ignore:
Timestamp:
08/01/11 12:44:16 (13 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

fixed address parsing error

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libroar/basic.c

    r5114 r5120  
    191191  // find a port: 
    192192 
    193   strncat(user_sock, server, sizeof(user_sock)-1); 
     193  strncpy(user_sock, server, sizeof(user_sock)-1); 
    194194  user_sock[sizeof(user_sock)-1] = 0; 
    195   server = user_sock; 
    196195 
    197196  if ( *user_sock != '/' ) { // don't test AF_UNIX sockets for ports 
     
    213212  if ( is_decnet ) { 
    214213   if ( *user_sock == ':' ) { 
    215     if ( roar_socket_get_local_nodename() ) 
    216      roar_mm_strlcat(user_sock, roar_socket_get_local_nodename(), sizeof(user_sock)-1); 
     214    if ( roar_socket_get_local_nodename() != NULL ) { 
     215     strncpy(user_sock, roar_socket_get_local_nodename(), sizeof(user_sock)-1); 
    217216     user_sock[sizeof(user_sock)-1] = 0; 
     217     roar_mm_strlcat(user_sock, server, sizeof(user_sock)-1); 
     218     user_sock[sizeof(user_sock)-1] = 0; 
     219     obj  = strstr(user_sock, "::"); 
     220     obj += 2; 
     221    } 
    218222   } 
    219223 
     
    226230#endif 
    227231   } 
     232    ROAR_DBG("roar_connect_raw2(*): user_sock='%s'", user_sock); 
    228233  } 
    229234 
Note: See TracChangeset for help on using the changeset viewer.