$NetBSD$

--- mserv/opt.c.orig	Sun Aug  3 15:57:20 2003
+++ mserv/opt.c
@@ -115,7 +115,7 @@ int opt_read(const char *root)
 	sprintf(m, "%s/%s", root, val);
       } else {
 	/* value is absolute path */
-	if ((m = malloc(strlen(val))) == NULL) {
+	if ((m = malloc(strlen(val)+1)) == NULL) {
 	  fprintf(stderr, "%s: out of memory building path\n", progname);
 	  return -1;
 	}
@@ -164,8 +164,8 @@ int opt_read(const char *root)
   /* special case - player variable is an indirected to another variable */
   if ((val = conf_getvalue("player")) == NULL) {
     if (mserv_verbose)
-      printf("No player specified, defaulting to /usr/local/bin/mpg123\n");
-    opt_player = "/usr/local/bin/mpg123";
+      printf("No player specified, defaulting to " PATH_MPG123 "\n");
+    opt_player = PATH_MPG123;
   } else {
     if ((opt_player = conf_getvalue(val)) == NULL) {
       fprintf(stderr, "%s: player setting '%s' not found\n", progname,
