Changeset 5534:ea9da1d777c7 in roaraudio for roarclients/roarshout.c

Timestamp:

06/12/12 14:59:42 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Done more hardending work.

File:

• roarclients/roarshout.c (modified) (2 diffs)

roarclients/roarshout.c

@@ -93 +93 @@
  enum { ARG, ASK, DSTR } pw_source = ARG;
  struct roar_audio_info info;
- char * server   = NULL;
- char * k;
- char * s_server = NULL;
- char * s_mount  = NULL;
+ const char * server   = NULL;
+ const char * k;
+ const char * s_server = NULL;
+ const char * s_mount  = NULL;
  char * s_pw     = NULL;
  int    s_port   = -1;
- char * s_desc   = NULL;
- char * s_genre  = NULL;
- char * s_name   = NULL;
- char * s_url    = NULL;
+ const char * s_desc   = NULL;
+ const char * s_genre  = NULL;
+ const char * s_name   = NULL;
+ const char * s_url    = NULL;
  int    s_public = 0;
  roar_vs_t * vss;
@@ -159 +159 @@
    s_port   = atoi(k);
   } else if ( s_pw     == NULL ) {
-   s_pw     = k;
+   s_pw     = argv[i]; // do not use k here so k can be const.
   } else if ( s_mount  == NULL ) {
    s_mount  = k;